diff --git a/contrib/mslib/datadef.h b/contrib/mslib/datadef.h
index c5bdd3e1f..71a18bae4 100644
--- a/contrib/mslib/datadef.h
+++ b/contrib/mslib/datadef.h
@@ -2,8 +2,8 @@
  * MW. Include for spice 
  */
 
-#ifndef DATADEF_INC
-#define DATADEF_INC
+#ifndef ngspice_DATADEF_H
+#define ngspice_DATADEF_H
 
 	/*
 	 * Program defaults
diff --git a/src/conf.h b/src/conf.h
index 38c0d8f9f..84378543e 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-#ifndef __CONF_H
-#define __CONF_H
+#ifndef ngspice_CONF_H
+#define ngspice_CONF_H
 
 extern char Spice_Version[];
 extern char Spice_Notice[];
diff --git a/src/frontend/arg.h b/src/frontend/arg.h
index a82831ab8..268594532 100644
--- a/src/frontend/arg.h
+++ b/src/frontend/arg.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef ARG_H_INCLUDED
-#define ARG_H_INCLUDED
+#ifndef ngspice_ARG_H
+#define ngspice_ARG_H
 
 char *prompt(FILE *fp);
 int countargs(wordlist *wl);
diff --git a/src/frontend/aspice.h b/src/frontend/aspice.h
index 02f5e3ab7..637b99efa 100644
--- a/src/frontend/aspice.h
+++ b/src/frontend/aspice.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef ASPICE_H_INCLUDED
-#define ASPICE_H_INCLUDED
+#ifndef ngspice_ASPICE_H
+#define ngspice_ASPICE_H
 
 
 void com_aspice(wordlist *wl);
diff --git a/src/frontend/breakp.h b/src/frontend/breakp.h
index 919132ed6..23c6e7059 100644
--- a/src/frontend/breakp.h
+++ b/src/frontend/breakp.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef BREAKP_H_INCLUDED
-#define BREAKP_H_INCLUDED
+#ifndef ngspice_BREAKP_H
+#define ngspice_BREAKP_H
 
 void com_stop(wordlist *wl);
 void com_trce(wordlist *wl);
diff --git a/src/frontend/breakp2.h b/src/frontend/breakp2.h
index ee79fcc77..587494581 100644
--- a/src/frontend/breakp2.h
+++ b/src/frontend/breakp2.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef BREAKP2_H_INCLUDED
-#define BREAKP2_H_INCLUDED
+#ifndef ngspice_BREAKP2_H
+#define ngspice_BREAKP2_H
 
 
 void com_save(wordlist *wl);
diff --git a/src/frontend/circuits.h b/src/frontend/circuits.h
index b3415fca2..871466146 100644
--- a/src/frontend/circuits.h
+++ b/src/frontend/circuits.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CIRCUITS_H_INCLUDED
-#define CIRCUITS_H_INCLUDED
+#ifndef ngspice_CIRCUITS_H
+#define ngspice_CIRCUITS_H
 
 
 struct subcirc {
diff --git a/src/frontend/com_alias.h b/src/frontend/com_alias.h
index dd4e0d064..b7b06f697 100644
--- a/src/frontend/com_alias.h
+++ b/src/frontend/com_alias.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef ALIAS_H_INCLUDED
-#define ALIAS_H_INCLUDED
+#ifndef ngspice_COM_ALIAS_H
+#define ngspice_COM_ALIAS_H
 
 void com_alias(wordlist *wl);
 void com_unalias(wordlist *wl);
diff --git a/src/frontend/com_chdir.h b/src/frontend/com_chdir.h
index 7eef35896..ae3476667 100644
--- a/src/frontend/com_chdir.h
+++ b/src/frontend/com_chdir.h
@@ -2,8 +2,8 @@
 * Header file for com_chdir.c
 ************/
 
-#ifndef COM_CHDIR_H
-#define COM_CHDIR_H
+#ifndef ngspice_COM_CHDIR_H
+#define ngspice_COM_CHDIR_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_dl.h b/src/frontend/com_dl.h
index 646bc6ae4..fcb9b1ce8 100644
--- a/src/frontend/com_dl.h
+++ b/src/frontend/com_dl.h
@@ -1,5 +1,5 @@
 #ifndef ngspice_COM_DL_H
-#define ngspice_COM_DL_H 1
+#define ngspice_COM_DL_H
 
 #ifdef XSPICE
 void com_codemodel(wordlist *wl);
diff --git a/src/frontend/com_echo.h b/src/frontend/com_echo.h
index e73ea748a..9952e1e9f 100644
--- a/src/frontend/com_echo.h
+++ b/src/frontend/com_echo.h
@@ -2,8 +2,8 @@
 * Header file for com_echo.c
 ************/
 
-#ifndef COM_ECHO_H
-#define COM_ECHO_H
+#ifndef ngspice_COM_ECHO_H
+#define ngspice_COM_ECHO_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_fft.h b/src/frontend/com_fft.h
index d0e7a95c4..bb89ea924 100644
--- a/src/frontend/com_fft.h
+++ b/src/frontend/com_fft.h
@@ -3,8 +3,8 @@
  * 2008 H. Vogt
  ************/
 
-#ifndef FFT_H_INCLUDED
-#define FFT_H_INCLUDED
+#ifndef ngspice_COM_FFT_H
+#define ngspice_COM_FFT_H
 
 void com_fft(wordlist *wl);
 void com_psd(wordlist *wl);
diff --git a/src/frontend/com_rehash.h b/src/frontend/com_rehash.h
index d28bb3c08..6e49262fb 100644
--- a/src/frontend/com_rehash.h
+++ b/src/frontend/com_rehash.h
@@ -2,8 +2,8 @@
 * Header file for com_rehsh.c
 ************/
 
-#ifndef COM_REHASH_H
-#define COM_REHASH_H
+#ifndef ngspice_COM_REHASH_H
+#define ngspice_COM_REHASH_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_shell.h b/src/frontend/com_shell.h
index e3d3a2c8d..d20a273a7 100644
--- a/src/frontend/com_shell.h
+++ b/src/frontend/com_shell.h
@@ -2,8 +2,8 @@
 * Header file for com_shell.c
 ************/
 
-#ifndef COM_SHELL_H
-#define COM_SHELL_H
+#ifndef ngspice_COM_SHELL_H
+#define ngspice_COM_SHELL_H
 
 void com_shell(wordlist *wl);
 
diff --git a/src/frontend/com_shift.h b/src/frontend/com_shift.h
index 330937613..f2c793d04 100644
--- a/src/frontend/com_shift.h
+++ b/src/frontend/com_shift.h
@@ -2,8 +2,8 @@
 * Header file for com_shift.c
 ************/
 
-#ifndef COM_SHIFT_H
-#define COM_SHIFT_H
+#ifndef ngspice_COM_SHIFT_H
+#define ngspice_COM_SHIFT_H
 
 void com_shift(wordlist *wl);
 
diff --git a/src/frontend/com_unset.h b/src/frontend/com_unset.h
index 877a0bc65..84edcbfe5 100644
--- a/src/frontend/com_unset.h
+++ b/src/frontend/com_unset.h
@@ -2,8 +2,8 @@
 * Header file for com_unset.c
 ************/
 
-#ifndef COM_UNSET_H
-#define COM_UNSET_H
+#ifndef ngspice_COM_UNSET_H
+#define ngspice_COM_UNSET_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/control.h b/src/frontend/control.h
index 6e3267378..c65540a6e 100644
--- a/src/frontend/control.h
+++ b/src/frontend/control.h
@@ -2,8 +2,8 @@
  * Header file for control.c
 **********/
 
-#ifndef CONTROL_H
-#define CONTROL_H
+#ifndef ngspice_CONTROL_H
+#define ngspice_CONTROL_H
 
 #include "ngspice/bool.h"
 
diff --git a/src/frontend/cpitf.h b/src/frontend/cpitf.h
index e1cb33289..defbacd84 100644
--- a/src/frontend/cpitf.h
+++ b/src/frontend/cpitf.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CPITF_H_INCLUDED
-#define CPITF_H_INCLUDED
+#ifndef ngspice_CPITF_H
+#define ngspice_CPITF_H
 
 
 
diff --git a/src/frontend/define.h b/src/frontend/define.h
index 3fcd1c655..79a9460ca 100644
--- a/src/frontend/define.h
+++ b/src/frontend/define.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef DEFINE_H_INCLUDED
-#define DEFINE_H_INCLUDED
+#ifndef ngspice_DEFINE_H
+#define ngspice_DEFINE_H
 
 void com_define(wordlist *wlist);
 void com_undefine(wordlist *wlist);
diff --git a/src/frontend/device.h b/src/frontend/device.h
index a208891d0..c047c07d2 100644
--- a/src/frontend/device.h
+++ b/src/frontend/device.h
@@ -4,8 +4,8 @@
  * Modified: 2000 AlansFixes
  ************/
 
-#ifndef DEVICE_H_INCLUDED
-#define DEVICE_H_INCLUDED
+#ifndef ngspice_DEVICE_H
+#define ngspice_DEVICE_H
 
 #define LEFT_WIDTH 11
 #define DEV_WIDTH 21
diff --git a/src/frontend/dimens.h b/src/frontend/dimens.h
index 029992910..735c24f28 100644
--- a/src/frontend/dimens.h
+++ b/src/frontend/dimens.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef DIMENS_H_INCLUDED
-#define DIMENS_H_INCLUDED
+#ifndef ngspice_DIMENS_H
+#define ngspice_DIMENS_H
 
 void dimstring(int *data, int length, char *retstring);
 void indexstring(int *data, int length, char *retstring);
diff --git a/src/frontend/display.h b/src/frontend/display.h
index 1add60aaf..00e6a736c 100644
--- a/src/frontend/display.h
+++ b/src/frontend/display.h
@@ -4,8 +4,8 @@
  ************/
 
 /*  See if we have been already included  */
-#ifndef DISPLAY_H_INCLUDED
-#define DISPLAY_H_INCLUDED
+#ifndef ngspice_DISPLAY_H
+#define ngspice_DISPLAY_H
 
 /*  Include a bunch of other stuff to make display.h work  */
 #include "ngspice/ftedev.h"
diff --git a/src/frontend/dotcards.h b/src/frontend/dotcards.h
index 89751efb8..d8079f710 100644
--- a/src/frontend/dotcards.h
+++ b/src/frontend/dotcards.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef DOTCARDS_H_INCLUDED
-#define DOTCARDS_H_INCLUDED
+#ifndef ngspice_DOTCARDS_H
+#define ngspice_DOTCARDS_H
 
 wordlist *gettoks(char *s);
 
diff --git a/src/frontend/fourier.h b/src/frontend/fourier.h
index e30e237b8..16c7b9422 100644
--- a/src/frontend/fourier.h
+++ b/src/frontend/fourier.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef FOURIER_H_INCLUDED
-#define FOURIER_H_INCLUDED
+#ifndef ngspice_FOURIER_H
+#define ngspice_FOURIER_H
 
 void com_fourier(wordlist *wl);
 int fourier(wordlist *wl, struct plot *current);
diff --git a/src/frontend/gens.h b/src/frontend/gens.h
index 671ce4ffa..7cad49aa3 100644
--- a/src/frontend/gens.h
+++ b/src/frontend/gens.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef GENS_H_INCLUDED
-#define GENS_H_INCLUDED
+#ifndef ngspice_GENS_H
+#define ngspice_GENS_H
 
 #include "ngspice/dgen.h"
 
diff --git a/src/frontend/hpgl.h b/src/frontend/hpgl.h
index f9228194a..a118de35f 100644
--- a/src/frontend/hpgl.h
+++ b/src/frontend/hpgl.h
@@ -2,8 +2,8 @@
 * Header file for hpgl.c
 ************/
 
-#ifndef HPGH_H
-#define HPGH_H
+#ifndef ngspice_HPGL_H
+#define ngspice_HPGL_H
 
 disp_fn_Init_t             GL_Init;
 disp_fn_NewViewport_t      GL_NewViewport;
diff --git a/src/frontend/inp.h b/src/frontend/inp.h
index 717a43789..bf14b15be 100644
--- a/src/frontend/inp.h
+++ b/src/frontend/inp.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef INP_H_INCLUDED
-#define INP_H_INCLUDED
+#ifndef ngspice_INP_H
+#define ngspice_INP_H
 
 void com_listing(wordlist *wl);
 void com_edit(wordlist *wl);
diff --git a/src/frontend/inpcom.h b/src/frontend/inpcom.h
index f097b226a..60d44776d 100644
--- a/src/frontend/inpcom.h
+++ b/src/frontend/inpcom.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef INPCOM_H_INCLUDED
-#define INPCOM_H_INCLUDED
+#ifndef ngspice_INPCOM_H
+#define ngspice_INPCOM_H
 
 
 #endif
diff --git a/src/frontend/interp.h b/src/frontend/interp.h
index 4c6fe04ab..ae6b8f26d 100644
--- a/src/frontend/interp.h
+++ b/src/frontend/interp.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef INTERP_H_INCLUDED
-#define INTERP_H_INCLUDED
+#ifndef ngspice_INTERP_H
+#define ngspice_INTERP_H
 
 void lincopy(struct dvec *ov, double *newscale, int newlen, struct dvec *oldscale);
 
diff --git a/src/frontend/linear.h b/src/frontend/linear.h
index fff8e8f49..970dc87ac 100644
--- a/src/frontend/linear.h
+++ b/src/frontend/linear.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef LINEAR_H_INCLUDED
-#define LINEAR_H_INCLUDED
+#ifndef ngspice_LINEAR_H
+#define ngspice_LINEAR_H
 
 void com_linearize(wordlist *wl);
 
diff --git a/src/frontend/misccoms.h b/src/frontend/misccoms.h
index 29d06419d..a55523ee2 100644
--- a/src/frontend/misccoms.h
+++ b/src/frontend/misccoms.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef MISCCOMS_H_INCLUDED
-#define MISCCOMS_H_INCLUDED
+#ifndef ngspice_MISCCOMS_H
+#define ngspice_MISCCOMS_H
 
 void com_quit(wordlist *wl);
 void com_bug(wordlist *wl);
diff --git a/src/frontend/miscvars.h b/src/frontend/miscvars.h
index 8ca0865c7..a78af5a30 100644
--- a/src/frontend/miscvars.h
+++ b/src/frontend/miscvars.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef MISCVARS_H_INCLUDED
-#define MISCVARS_H_INCLUDED
+#ifndef ngspice_MISCVARS_H
+#define ngspice_MISCVARS_H
 
 
 
diff --git a/src/frontend/mw_coms.h b/src/frontend/mw_coms.h
index 8fb1ebd87..8ed078b06 100644
--- a/src/frontend/mw_coms.h
+++ b/src/frontend/mw_coms.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef MW_COMS_H_INCLUDED
-#define MW_COMS_H_INCLUDED
+#ifndef ngspice_MW_COMS_H
+#define ngspice_MW_COMS_H
 
 void com_removecirc(wordlist *wl);
 
diff --git a/src/frontend/newcoms.h b/src/frontend/newcoms.h
index 8bb632985..778d02d0c 100644
--- a/src/frontend/newcoms.h
+++ b/src/frontend/newcoms.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef NEWCOMS_H_INCLUDED
-#define NEWCOMS_H_INCLUDED
+#ifndef ngspice_NEWCOMS_H
+#define ngspice_NEWCOMS_H
 
 void com_reshape(wordlist *wl);
 
diff --git a/src/frontend/numparam/numpaif.h b/src/frontend/numparam/numpaif.h
index e53adc09c..51b1477e6 100644
--- a/src/frontend/numparam/numpaif.h
+++ b/src/frontend/numparam/numpaif.h
@@ -3,8 +3,8 @@
  * external interface to spice frontend  subckt.c
  */
 
-#ifndef NUMPAIF_H
-#define NUMPAIF_H
+#ifndef ngspice_NUMPAIF_H
+#define ngspice_NUMPAIF_H
 
 #define  NUPADECKCOPY 0
 #define  NUPASUBSTART 1
diff --git a/src/frontend/nutinp.h b/src/frontend/nutinp.h
index 699a998df..26ea519cf 100644
--- a/src/frontend/nutinp.h
+++ b/src/frontend/nutinp.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef NUTINP_H_INCLUDED
-#define NUTINP_H_INCLUDED
+#ifndef ngspice_NUTINP_H
+#define ngspice_NUTINP_H
 
 void nutinp_source(char *file);
 
diff --git a/src/frontend/nutmegif.h b/src/frontend/nutmegif.h
index c6f6a7aa3..af527ca65 100644
--- a/src/frontend/nutmegif.h
+++ b/src/frontend/nutmegif.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef NUTMEGIF_H_INCLUDED
-#define NUTMEGIF_H_INCLUDED
+#ifndef ngspice_NUTMEGIF_H
+#define ngspice_NUTMEGIF_H
 
 
 
diff --git a/src/frontend/options.h b/src/frontend/options.h
index ce9a4ee5e..dfd332681 100644
--- a/src/frontend/options.h
+++ b/src/frontend/options.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef OPTIONS_H_INCLUDED
-#define OPTIONS_H_INCLUDED
+#ifndef ngspice_OPTIONS_H
+#define ngspice_OPTIONS_H
 
 
 
diff --git a/src/frontend/outitf.h b/src/frontend/outitf.h
index d2787dc3e..c3446b4e3 100644
--- a/src/frontend/outitf.h
+++ b/src/frontend/outitf.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef OUTITF_H_INCLUDED
-#define OUTITF_H_INCLUDED
+#ifndef ngspice_OUTITF_H
+#define ngspice_OUTITF_H
 
 #include "ngspice/typedefs.h"
 
diff --git a/src/frontend/parser/backq.h b/src/frontend/parser/backq.h
index 1262d1aa2..0d97c4250 100644
--- a/src/frontend/parser/backq.h
+++ b/src/frontend/parser/backq.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef BACKQ_H_INCLUDED
-#define BACKQ_H_INCLUDED
+#ifndef ngspice_BACKQ_H
+#define ngspice_BACKQ_H
 
 
 #endif
diff --git a/src/frontend/parser/complete.h b/src/frontend/parser/complete.h
index 691eaf481..bacceb270 100644
--- a/src/frontend/parser/complete.h
+++ b/src/frontend/parser/complete.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef COMPLETE_H_INCLUDED
-#define COMPLETE_H_INCLUDED
+#ifndef ngspice_COMPLETE_H
+#define ngspice_COMPLETE_H
 
 /* The data structure for the commands is as follows: every node has a pointer
  * to its leftmost child, where the children of a node are those of which
diff --git a/src/frontend/parser/cshpar.h b/src/frontend/parser/cshpar.h
index e0bd556af..4f87b8422 100644
--- a/src/frontend/parser/cshpar.h
+++ b/src/frontend/parser/cshpar.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CSHPAR_H_INCLUDED
-#define CSHPAR_H_INCLUDED
+#ifndef ngspice_CSHPAR_H
+#define ngspice_CSHPAR_H
 
 
 #endif
diff --git a/src/frontend/parser/glob.h b/src/frontend/parser/glob.h
index 97b817062..624aea94c 100644
--- a/src/frontend/parser/glob.h
+++ b/src/frontend/parser/glob.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef GLOB_H_INCLUDED
-#define GLOB_H_INCLUDED
+#ifndef ngspice_GLOB_H
+#define ngspice_GLOB_H
 
 
 #endif
diff --git a/src/frontend/parser/input.h b/src/frontend/parser/input.h
index cc77ce219..10ff24cc9 100644
--- a/src/frontend/parser/input.h
+++ b/src/frontend/parser/input.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef INPUT_H_INCLUDED
-#define INPUT_H_INCLUDED
+#ifndef ngspice_INPUT_H
+#define ngspice_INPUT_H
 
 
 int input(FILE *fp);
diff --git a/src/frontend/parser/lexical.h b/src/frontend/parser/lexical.h
index c86de872c..3f2051249 100644
--- a/src/frontend/parser/lexical.h
+++ b/src/frontend/parser/lexical.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef LEXICAL_H_INCLUDED
-#define LEXICAL_H_INCLUDED
+#ifndef ngspice_LEXICAL_H
+#define ngspice_LEXICAL_H
 
 
 int input(FILE *fp);
diff --git a/src/frontend/parser/numparse.h b/src/frontend/parser/numparse.h
index b2c8dfa1a..874f528ac 100644
--- a/src/frontend/parser/numparse.h
+++ b/src/frontend/parser/numparse.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef NUMPARSE_H_INCLUDED
-#define NUMPARSE_H_INCLUDED
+#ifndef ngspice_NUMPARSE_H
+#define ngspice_NUMPARSE_H
 
 
 #endif
diff --git a/src/frontend/parser/unixcom.h b/src/frontend/parser/unixcom.h
index 707c6d86f..96dbf0ce3 100644
--- a/src/frontend/parser/unixcom.h
+++ b/src/frontend/parser/unixcom.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef UNIXCOM_H_INCLUDED
-#define UNIXCOM_H_INCLUDED
+#ifndef ngspice_UNIXCOM_H
+#define ngspice_UNIXCOM_H
 
 
 #endif
diff --git a/src/frontend/plotting/clip.h b/src/frontend/plotting/clip.h
index d6a9fc13e..8333bcdba 100644
--- a/src/frontend/plotting/clip.h
+++ b/src/frontend/plotting/clip.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CLIP_H_INCLUDED
-#define CLIP_H_INCLUDED
+#ifndef ngspice_CLIP_H
+#define ngspice_CLIP_H
 
 
 
diff --git a/src/frontend/plotting/gnuplot.h b/src/frontend/plotting/gnuplot.h
index 4ce93eda1..533826a35 100644
--- a/src/frontend/plotting/gnuplot.h
+++ b/src/frontend/plotting/gnuplot.h
@@ -3,8 +3,8 @@
  * 2008 Stefano Pedretti
  ************/
 
-#ifndef GNUPLOT_H_INCLUDED
-#define GNUPLOT_H_INCLUDED
+#ifndef ngspice_GNUPLOT_H
+#define ngspice_GNUPLOT_H
 
 void ft_gnuplot(double *xlims, double *ylims, char *filename, char *title,
                char *xlabel, char *ylabel, GRIDTYPE gridtype, PLOTTYPE plottype,
diff --git a/src/frontend/plotting/graf.h b/src/frontend/plotting/graf.h
index 9c798820e..247787bc5 100644
--- a/src/frontend/plotting/graf.h
+++ b/src/frontend/plotting/graf.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef GRAF_H
-#define GRAF_H
+#ifndef ngspice_GRAF_H
+#define ngspice_GRAF_H
 
 #include "ngspice/graph.h"
 
diff --git a/src/frontend/plotting/graphdb.h b/src/frontend/plotting/graphdb.h
index d2a9ba13e..14114488a 100644
--- a/src/frontend/plotting/graphdb.h
+++ b/src/frontend/plotting/graphdb.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef GRAPHDB_H_INCLUDED
-#define GRAPHDB_H_INCLUDED
+#ifndef ngspice_GRAPHDB_H
+#define ngspice_GRAPHDB_H
 
 int DestroyGraph(int id);
 void FreeGraphs(void);
diff --git a/src/frontend/plotting/plot5.h b/src/frontend/plotting/plot5.h
index 6c2a346b9..329f7397d 100644
--- a/src/frontend/plotting/plot5.h
+++ b/src/frontend/plotting/plot5.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef PLOT5_H_INCLUDED
-#define PLOT5_H_INCLUDED
+#ifndef ngspice_PLOT5_H
+#define ngspice_PLOT5_H
 
 disp_fn_Init_t             Plt5_Init;
 disp_fn_NewViewport_t      Plt5_NewViewport;
diff --git a/src/frontend/plotting/plotcurv.h b/src/frontend/plotting/plotcurv.h
index b85c78093..420af0c3e 100644
--- a/src/frontend/plotting/plotcurv.h
+++ b/src/frontend/plotting/plotcurv.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef PLOTCURV_H_INCLUDED
-#define PLOTCURV_H_INCLUDED
+#ifndef ngspice_PLOTCURV_H
+#define ngspice_PLOTCURV_H
 
 
 
diff --git a/src/frontend/plotting/x11.h b/src/frontend/plotting/x11.h
index a6735ac2f..fdc479a40 100644
--- a/src/frontend/plotting/x11.h
+++ b/src/frontend/plotting/x11.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef X11_H_INCLUDED
-#define X11_H_INCLUDED
+#ifndef ngspice_X11_H
+#define ngspice_X11_H
 
 #ifndef X_DISPLAY_MISSING
 
diff --git a/src/frontend/plotting/xgraph.h b/src/frontend/plotting/xgraph.h
index a45de05b2..e900bfa54 100644
--- a/src/frontend/plotting/xgraph.h
+++ b/src/frontend/plotting/xgraph.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef XGRAPH_H_INCLUDED
-#define XGRAPH_H_INCLUDED
+#ifndef ngspice_XGRAPH_H
+#define ngspice_XGRAPH_H
 
 void ft_xgraph(double *xlims, double *ylims, char *filename, char *title,
                char *xlabel, char *ylabel, GRIDTYPE gridtype, PLOTTYPE plottype,
diff --git a/src/frontend/points.h b/src/frontend/points.h
index f26485ca8..c30da5f06 100644
--- a/src/frontend/points.h
+++ b/src/frontend/points.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef POINTS_H_INCLUDED
-#define POINTS_H_INCLUDED
+#ifndef ngspice_POINTS_H
+#define ngspice_POINTS_H
 
 double * ft_SMITHminmax(struct dvec *v, bool yval);
 int SMITH_tfm(double re, double im, double *x, double *y);
diff --git a/src/frontend/postcoms.h b/src/frontend/postcoms.h
index e6ff112db..cff23e94a 100644
--- a/src/frontend/postcoms.h
+++ b/src/frontend/postcoms.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef POSTCOMS_H_INCLUDED
-#define POSTCOMS_H_INCLUDED
+#ifndef ngspice_POSTCOMS_H
+#define ngspice_POSTCOMS_H
 
 void com_unlet(wordlist *wl);
 void com_load(wordlist *wl);
diff --git a/src/frontend/postsc.h b/src/frontend/postsc.h
index 4e15bd9b7..4f5680a9a 100644
--- a/src/frontend/postsc.h
+++ b/src/frontend/postsc.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef POSTSC_H_INCLUDED
-#define POSTSC_H_INCLUDED
+#ifndef ngspice_POSTSC_H
+#define ngspice_POSTSC_H
 
 disp_fn_Init_t             PS_Init;
 disp_fn_NewViewport_t      PS_NewViewport;
diff --git a/src/frontend/quote.h b/src/frontend/quote.h
index 214bb99d3..ecb7a3dc9 100644
--- a/src/frontend/quote.h
+++ b/src/frontend/quote.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef QUOTE_H_INCLUDED
-#define QUOTE_H_INCLUDED
+#ifndef ngspice_QUOTE_H
+#define ngspice_QUOTE_H
 
 
 
diff --git a/src/frontend/rawfile.h b/src/frontend/rawfile.h
index 2e3dca4a9..5ed204ff4 100644
--- a/src/frontend/rawfile.h
+++ b/src/frontend/rawfile.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef RAWFILE_H_INCLUDED
-#define RAWFILE_H_INCLUDED
+#ifndef ngspice_RAWFILE_H
+#define ngspice_RAWFILE_H
 
 
 
diff --git a/src/frontend/resource.h b/src/frontend/resource.h
index ee227d9e0..6d5f8c38d 100644
--- a/src/frontend/resource.h
+++ b/src/frontend/resource.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef RESOURCES_H_INCLUDED
-#define RESOURCES_H_INCLUDED
+#ifndef ngspice_RESOURCE_H
+#define ngspice_RESOURCE_H
 
 void init_rlimits(void);
 void init_time(void);
diff --git a/src/frontend/runcoms.h b/src/frontend/runcoms.h
index d24307c28..714239e50 100644
--- a/src/frontend/runcoms.h
+++ b/src/frontend/runcoms.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef RUNCOMS_H_INCLUDED
-#define RUNCOMS_H_INCLUDED
+#ifndef ngspice_RUNCOMS_H
+#define ngspice_RUNCOMS_H
 
 void com_scirc(wordlist *wl);
 void com_pz(wordlist *wl);
diff --git a/src/frontend/runcoms2.h b/src/frontend/runcoms2.h
index 337eabe3b..957a64ece 100644
--- a/src/frontend/runcoms2.h
+++ b/src/frontend/runcoms2.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef RUNCOMS2_H_INCLUDED
-#define RUNCOMS2_H_INCLUDED
+#ifndef ngspice_RUNCOMS2_H
+#define ngspice_RUNCOMS2_H
 
 void com_resume(wordlist *wl);
 void com_rset(wordlist *wl);
diff --git a/src/frontend/shyu.h b/src/frontend/shyu.h
index 32b69794b..a4219836a 100644
--- a/src/frontend/shyu.h
+++ b/src/frontend/shyu.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef SHYU_H_INCLUDED
-#define SHYU_H_INCLUDED
+#ifndef ngspice_SHYU_H
+#define ngspice_SHYU_H
 
 
 
diff --git a/src/frontend/signal_handler.h b/src/frontend/signal_handler.h
index 80fd98615..3c189236e 100644
--- a/src/frontend/signal_handler.h
+++ b/src/frontend/signal_handler.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef SIGNAL_HANDLER_H_INCLUDED
-#define SIGNAL_HANDLER_H_INCLUDED
+#ifndef ngspice_SIGNAL_HANDLER_H
+#define ngspice_SIGNAL_HANDLER_H
 
 RETSIGTYPE ft_sigintr(void);
 RETSIGTYPE sigfloat(int sig, int code);
diff --git a/src/frontend/spec.h b/src/frontend/spec.h
index 6962830bd..a3dcd9211 100644
--- a/src/frontend/spec.h
+++ b/src/frontend/spec.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef SPEC_H_INCLUDED
-#define SPEC_H_INCLUDED
+#ifndef ngspice_SPEC_H
+#define ngspice_SPEC_H
 
 #ifdef HAS_WINDOWS
 extern void SetAnalyse(char *Analyse, int Percent);
diff --git a/src/frontend/spiceif.h b/src/frontend/spiceif.h
index ff7c47e61..b76e7ca36 100644
--- a/src/frontend/spiceif.h
+++ b/src/frontend/spiceif.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef SPICEIF_H_INCLUDED
-#define SPICEIF_H_INCLUDED
+#ifndef ngspice_SPICEIF_H
+#define ngspice_SPICEIF_H
 
 CKTcircuit * if_inpdeck(struct line *deck, INPtables **tab);
 int if_run(CKTcircuit *t, char *what, wordlist *args, INPtables *tab);
diff --git a/src/frontend/streams.h b/src/frontend/streams.h
index 416f942f8..8306967d5 100644
--- a/src/frontend/streams.h
+++ b/src/frontend/streams.h
@@ -2,8 +2,8 @@
 * Header file for streams.c
 ************/
 
-#ifndef STREAMS_H
-#define STREAMS_H
+#ifndef ngspice_STREAMS_H
+#define ngspice_STREAMS_H
 
 #include "ngspice/bool.h"
 #include "ngspice/wordlist.h"
diff --git a/src/frontend/subckt.h b/src/frontend/subckt.h
index ec9a47fe7..969b7e95c 100644
--- a/src/frontend/subckt.h
+++ b/src/frontend/subckt.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef SUBCKT_H_INCLUDED
-#define SUBCKT_H_INCLUDED
+#ifndef ngspice_SUBCKT_H
+#define ngspice_SUBCKT_H
 
 struct line * inp_subcktexpand(struct line *deck);
 struct line * inp_deckcopy(struct line *deck);
diff --git a/src/frontend/typesdef.h b/src/frontend/typesdef.h
index 5797ce1db..2d0a92c8d 100644
--- a/src/frontend/typesdef.h
+++ b/src/frontend/typesdef.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef TYPESDEF_H_INCLUDED
-#define TYPESDEF_H_INCLUDED
+#ifndef ngspice_TYPESDEF_H
+#define ngspice_TYPESDEF_H
 
 void com_dftype(wordlist *wl);
 void com_stype(wordlist *wl);
diff --git a/src/frontend/vectors.h b/src/frontend/vectors.h
index bcf6f1910..babdd339d 100644
--- a/src/frontend/vectors.h
+++ b/src/frontend/vectors.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef VECTORS_H_INCLUDED
-#define VECTORS_H_INCLUDED
+#ifndef ngspice_VECTORS_H
+#define ngspice_VECTORS_H
 
 #define vec_free(ptr)  vec_free_x(ptr); ptr=NULL
 
diff --git a/src/frontend/wdisp/windisp.h b/src/frontend/wdisp/windisp.h
index c72fb8cad..84ae99bca 100644
--- a/src/frontend/wdisp/windisp.h
+++ b/src/frontend/wdisp/windisp.h
@@ -2,8 +2,8 @@
 * Header file for windisp.c
 ************/
 
-#ifndef WINDISP_H
-#define WINDISP_H
+#ifndef ngspice_WINDISP_H
+#define ngspice_WINDISP_H
 
 disp_fn_Init_t             WIN_Init;
 disp_fn_NewViewport_t      WIN_NewViewport;
diff --git a/src/frontend/wdisp/winprint.h b/src/frontend/wdisp/winprint.h
index 90d92b395..8a92992b0 100644
--- a/src/frontend/wdisp/winprint.h
+++ b/src/frontend/wdisp/winprint.h
@@ -2,8 +2,8 @@
 * Header file for winprint.c
 ************/
 
-#ifndef WINPRINT_H
-#define WINPRINT_H
+#ifndef ngspice_WINPRINT_H
+#define ngspice_WINPRINT_H
 
 void WPRINT_PrintInit(HWND hwnd);
 BOOL CALLBACK WPRINT_Abort( HDC hdc, int iError);
diff --git a/src/frontend/where.h b/src/frontend/where.h
index 1ef9025d4..40d9e5e79 100644
--- a/src/frontend/where.h
+++ b/src/frontend/where.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef WHERE_H_INCLUDED
-#define WHERE_H_INCLUDED
+#ifndef ngspice_WHERE_H
+#define ngspice_WHERE_H
 
 void com_where(wordlist *wl);
 
diff --git a/src/include/ngspice/acdefs.h b/src/include/ngspice/acdefs.h
index 66699d031..5f12777d2 100644
--- a/src/include/ngspice/acdefs.h
+++ b/src/include/ngspice/acdefs.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef ACDEFS
-#define ACDEFS
+#ifndef ngspice_ACDEFS_H
+#define ngspice_ACDEFS_H
 
 #include "ngspice/jobdefs.h"
 
diff --git a/src/include/ngspice/bdrydefs.h b/src/include/ngspice/bdrydefs.h
index e04cc31ea..d71752ace 100644
--- a/src/include/ngspice/bdrydefs.h
+++ b/src/include/ngspice/bdrydefs.h
@@ -8,8 +8,8 @@ Authors :  1991 David Gates
  */
 
 
-#ifndef BDRY_H
-#define BDRY_H
+#ifndef ngspice_BDRYDEFS_H
+#define ngspice_BDRYDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/carddefs.h b/src/include/ngspice/carddefs.h
index a77a6fb48..90f901af3 100644
--- a/src/include/ngspice/carddefs.h
+++ b/src/include/ngspice/carddefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef CARDDEFS_H
-#define CARDDEFS_H
+#ifndef ngspice_CARDDEFS_H
+#define ngspice_CARDDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 #include "ngspice/bdrydefs.h"
diff --git a/src/include/ngspice/cluster.h b/src/include/ngspice/cluster.h
index 141a54aba..b6391c29b 100644
--- a/src/include/ngspice/cluster.h
+++ b/src/include/ngspice/cluster.h
@@ -1,5 +1,5 @@
-#ifndef ngspice_CLUSTER_H_
-#define ngspice_CLUSTER_H_
+#ifndef ngspice_CLUSTER_H
+#define ngspice_CLUSTER_H
 #include "ngspice/cktdefs.h"
 
 /* Cluster definitions */
diff --git a/src/include/ngspice/cm.h b/src/include/ngspice/cm.h
index e3fb9ea7b..9775489fd 100644
--- a/src/include/ngspice/cm.h
+++ b/src/include/ngspice/cm.h
@@ -1,5 +1,5 @@
-#ifndef CM_DEFINED
-#define CM_DEFINED
+#ifndef ngspice_CM_H
+#define ngspice_CM_H
 
 /* ===========================================================================
 FILE    CM.h
diff --git a/src/include/ngspice/cmconstants.h b/src/include/ngspice/cmconstants.h
index 6dc7d96af..abfd45fa4 100644
--- a/src/include/ngspice/cmconstants.h
+++ b/src/include/ngspice/cmconstants.h
@@ -1,5 +1,5 @@
-#ifndef CMCONSTANTS_DEFINED
-#define CMCONSTANTS_DEFINED
+#ifndef ngspice_CMCONSTANTS_H
+#define ngspice_CMCONSTANTS_H
 
 /* ===========================================================================
 FILE    CMconstants.h
diff --git a/src/include/ngspice/cmproto.h b/src/include/ngspice/cmproto.h
index d5b281e3a..bae49bddb 100644
--- a/src/include/ngspice/cmproto.h
+++ b/src/include/ngspice/cmproto.h
@@ -1,5 +1,5 @@
-#ifndef CMPROTO_DEFINED
-#define CMPROTO_DEFINED
+#ifndef ngspice_CMPROTO_H
+#define ngspice_CMPROTO_H
 
 /* ===========================================================================
 FILE    CMproto.h
diff --git a/src/include/ngspice/cmtypes.h b/src/include/ngspice/cmtypes.h
index bd7b30d3f..7b393cee4 100644
--- a/src/include/ngspice/cmtypes.h
+++ b/src/include/ngspice/cmtypes.h
@@ -1,5 +1,5 @@
-#ifndef CMTYPES_DEFINED
-#define CMTYPES_DEFINED
+#ifndef ngspice_CMTYPES_H
+#define ngspice_CMTYPES_H
 
 /* ===========================================================================
 FILE    CMtypes.h
diff --git a/src/include/ngspice/const.h b/src/include/ngspice/const.h
index 61df9e20b..1a96ef640 100644
--- a/src/include/ngspice/const.h
+++ b/src/include/ngspice/const.h
@@ -4,8 +4,8 @@ Author: 1985 Thomas L. Quarles
 **********/
 /*
  */
-#ifndef CONST_H
-#define CONST_H
+#ifndef ngspice_CONST_H
+#define ngspice_CONST_H
 
 #define CHARGE (1.6021918e-19)
 #define CONSTCtoK (273.15)
diff --git a/src/include/ngspice/contdefs.h b/src/include/ngspice/contdefs.h
index 3efe6c28d..cdc9d1c6e 100644
--- a/src/include/ngspice/contdefs.h
+++ b/src/include/ngspice/contdefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef CONT_H
-#define CONT_H
+#ifndef ngspice_CONTDEFS_H
+#define ngspice_CONTDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/cpdefs.h b/src/include/ngspice/cpdefs.h
index fc76dde2a..e8b33f853 100644
--- a/src/include/ngspice/cpdefs.h
+++ b/src/include/ngspice/cpdefs.h
@@ -8,8 +8,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  */
 
 /* Standard definitions */
-#ifndef CPDEFS
-#define CPDEFS
+#ifndef ngspice_CPDEFS_H
+#define ngspice_CPDEFS_H
 
 #include "ngspice/cpstd.h"
 
diff --git a/src/include/ngspice/cpextern.h b/src/include/ngspice/cpextern.h
index 023243eac..2d177e9e3 100644
--- a/src/include/ngspice/cpextern.h
+++ b/src/include/ngspice/cpextern.h
@@ -8,8 +8,8 @@ Modified: 2000  AlansFixes
  * Definitions for all external symbols in CP.
  */
 
-#ifndef CPEXTERN_H
-#define CPEXTERN_H
+#ifndef ngspice_CPEXTERN_H
+#define ngspice_CPEXTERN_H
 
 #include "ngspice/wordlist.h"
 #include "ngspice/bool.h"
diff --git a/src/include/ngspice/cpstd.h b/src/include/ngspice/cpstd.h
index e6f6ef560..121654381 100644
--- a/src/include/ngspice/cpstd.h
+++ b/src/include/ngspice/cpstd.h
@@ -8,8 +8,8 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
  * wlist.c
  */
 
-#ifndef ngspice_CPSTD_H_
-#define ngspice_CPSTD_H_
+#ifndef ngspice_CPSTD_H
+#define ngspice_CPSTD_H
 
 
 #ifndef FILE
diff --git a/src/include/ngspice/defines.h b/src/include/ngspice/defines.h
index 416effc0c..98663e245 100644
--- a/src/include/ngspice/defines.h
+++ b/src/include/ngspice/defines.h
@@ -10,8 +10,8 @@
  */
 
 
-#ifndef ngspice_DEFINES_H_
-#define ngspice_DEFINES_H_
+#ifndef ngspice_DEFINES_H
+#define ngspice_DEFINES_H
 
 
 #ifndef	M_PI
diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h
index 448260862..c91598f54 100644
--- a/src/include/ngspice/devdefs.h
+++ b/src/include/ngspice/devdefs.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef DEV
-#define DEV
+#ifndef ngspice_DEVDEFS_H
+#define ngspice_DEVDEFS_H
 
 #include "ngspice/optdefs.h"
 #include "ngspice/gendefs.h"
diff --git a/src/include/ngspice/dgen.h b/src/include/ngspice/dgen.h
index 92fa1740c..43290bbc3 100644
--- a/src/include/ngspice/dgen.h
+++ b/src/include/ngspice/dgen.h
@@ -1,5 +1,5 @@
-#ifndef DGEN_H
-#define DGEN_H
+#ifndef ngspice_DGEN_H
+#define ngspice_DGEN_H
 
 typedef struct st_dgen dgen;
 
diff --git a/src/include/ngspice/distodef.h b/src/include/ngspice/distodef.h
index 6ab0565a0..67b579c08 100644
--- a/src/include/ngspice/distodef.h
+++ b/src/include/ngspice/distodef.h
@@ -4,8 +4,8 @@ Author: 1988 Jaijeet S Roychowdhury
 Modified: 2000 AlansFixes
 **********/
 
-#ifndef DISTODEF
-#define DISTODEF
+#ifndef ngspice_DISTODEF_H
+#define ngspice_DISTODEF_H
 
 #ifdef D_DBG_ALLTIMES
 #define D_DBG_BLOCKTIMES
diff --git a/src/include/ngspice/dllitf.h b/src/include/ngspice/dllitf.h
index bb8d77701..8c6ccb8fc 100644
--- a/src/include/ngspice/dllitf.h
+++ b/src/include/ngspice/dllitf.h
@@ -3,8 +3,8 @@
    (c)2000 Arpad Buermen
 */
 
-#ifndef ngspice__DLLITF_H
-#define ngspice__DLLITF_H
+#ifndef ngspice_DLLITF_H
+#define ngspice_DLLITF_H
 
 #include "ngspice/mifproto.h"
 #include "ngspice/cmproto.h"
diff --git a/src/include/ngspice/domndefs.h b/src/include/ngspice/domndefs.h
index c99a20287..e1e8127a2 100644
--- a/src/include/ngspice/domndefs.h
+++ b/src/include/ngspice/domndefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef DOMN_H
-#define DOMN_H
+#ifndef ngspice_DOMNDEFS_H
+#define ngspice_DOMNDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/dopdefs.h b/src/include/ngspice/dopdefs.h
index af46ea59f..2374d8037 100644
--- a/src/include/ngspice/dopdefs.h
+++ b/src/include/ngspice/dopdefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef DOP_H
-#define DOP_H
+#ifndef ngspice_DOPDEFS_H
+#define ngspice_DOPDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/dstring.h b/src/include/ngspice/dstring.h
index 7ebcc09f5..443970971 100644
--- a/src/include/ngspice/dstring.h
+++ b/src/include/ngspice/dstring.h
@@ -1,7 +1,7 @@
 /*   dstring.h    */
 
-#ifndef DSTRING_H
-#define DSTRING_H
+#ifndef ngspice_DSTRING_H
+#define ngspice_DSTRING_H
 
 /* -----------------------------------------------------------------
  * This structure is modified from Tcl.   We do this to avoid a
diff --git a/src/include/ngspice/elctdefs.h b/src/include/ngspice/elctdefs.h
index ef5aa53d4..db102df3a 100644
--- a/src/include/ngspice/elctdefs.h
+++ b/src/include/ngspice/elctdefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef ELCT_H
-#define ELCT_H
+#ifndef ngspice_ELCTDEFS_H
+#define ngspice_ELCTDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/enh.h b/src/include/ngspice/enh.h
index 562c770f2..2c097a4f5 100644
--- a/src/include/ngspice/enh.h
+++ b/src/include/ngspice/enh.h
@@ -1,5 +1,5 @@
-#ifndef ENH_HEADER
-#define ENH_HEADER x
+#ifndef ngspice_ENH_H
+#define ngspice_ENH_H
 
 /* ===========================================================================
 FILE    ENH.h
diff --git a/src/include/ngspice/evt.h b/src/include/ngspice/evt.h
index 11038415b..546abb6fe 100644
--- a/src/include/ngspice/evt.h
+++ b/src/include/ngspice/evt.h
@@ -1,5 +1,5 @@
-#ifndef EVT_HEADER
-#define EVT_HEADER x
+#ifndef ngspice_EVT_H
+#define ngspice_EVT_H
 
 /* ===========================================================================
 FILE    EVT.h
diff --git a/src/include/ngspice/evtproto.h b/src/include/ngspice/evtproto.h
index 498f10791..28ce5b871 100644
--- a/src/include/ngspice/evtproto.h
+++ b/src/include/ngspice/evtproto.h
@@ -1,5 +1,5 @@
-#ifndef EVTPROTO_HEADER
-#define EVTPROTO_HEADER x
+#ifndef ngspice_EVTPROTO_H
+#define ngspice_EVTPROTO_H
 
 /* ===========================================================================
 FILE    EVTproto.h
diff --git a/src/include/ngspice/evtudn.h b/src/include/ngspice/evtudn.h
index fda6aa89d..936c44daf 100644
--- a/src/include/ngspice/evtudn.h
+++ b/src/include/ngspice/evtudn.h
@@ -1,5 +1,5 @@
-#ifndef EVTUDN_HEADER
-#define EVTUDN_HEADER x
+#ifndef ngspice_EVTUDN_H
+#define ngspice_EVTUDN_H
 
 /* ===========================================================================
 FILE    EVTudn.h
diff --git a/src/include/ngspice/ftedebug.h b/src/include/ngspice/ftedebug.h
index c81bdd012..f9225f43e 100644
--- a/src/include/ngspice/ftedebug.h
+++ b/src/include/ngspice/ftedebug.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 **********/
 
-#ifndef FTEDEBUG_H
-#define FTEDEBUG_H
+#ifndef ngspice_FTEDEBUG_H
+#define ngspice_FTEDEBUG_H
 
 /*
  *
diff --git a/src/include/ngspice/ftedefs.h b/src/include/ngspice/ftedefs.h
index affe0634a..7a64c0342 100644
--- a/src/include/ngspice/ftedefs.h
+++ b/src/include/ngspice/ftedefs.h
@@ -7,8 +7,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  *
  * General front end stuff.
  */
-#ifndef FTEdefs_h
-#define FTEdefs_h
+#ifndef ngspice_FTEDEFS_H
+#define ngspice_FTEDEFS_H
 
 #define DEF_WIDTH   80	/* Line printer width. */
 #define DEF_HEIGHT  60  /* Line printer height. */
diff --git a/src/include/ngspice/ftedev.h b/src/include/ngspice/ftedev.h
index d4dec153b..758ed61d3 100644
--- a/src/include/ngspice/ftedev.h
+++ b/src/include/ngspice/ftedev.h
@@ -7,8 +7,8 @@ Author: 1987 Jeffrey M. Hsu
     The display device structure.
 */
 
-#ifndef FTEDEV_H_INCLUDED
-#define FTEDEV_H_INCLUDED
+#ifndef ngspice_FTEDEV_H
+#define ngspice_FTEDEV_H
 
 struct graph;
 struct request;
diff --git a/src/include/ngspice/fteext.h b/src/include/ngspice/fteext.h
index d7d0c1ebb..0c30ec1d3 100644
--- a/src/include/ngspice/fteext.h
+++ b/src/include/ngspice/fteext.h
@@ -8,8 +8,8 @@ Modified: 1999 Paolo Nenzi - 2000 AlansFixes
  * Definitions for all external symbols in FTE.
  */
 
-#ifndef FTEext_h
-#define FTEext_h
+#ifndef ngspice_FTEEXT_H
+#define ngspice_FTEEXT_H
 
 #include "ngspice/config.h"
 
diff --git a/src/include/ngspice/fteinp.h b/src/include/ngspice/fteinp.h
index 89a89b531..8d449c7ad 100644
--- a/src/include/ngspice/fteinp.h
+++ b/src/include/ngspice/fteinp.h
@@ -8,8 +8,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Note that this definition must be the same as struct card in INPdefs.h...
  */
 
-#ifndef FTEinput_h
-#define FTEinput_h
+#ifndef ngspice_FTEINP_H
+#define ngspice_FTEINP_H
 
 #include "ngspice/inpdefs.h"
 
diff --git a/src/include/ngspice/fteinput.h b/src/include/ngspice/fteinput.h
index 84ddb7a2a..f2b5c448a 100644
--- a/src/include/ngspice/fteinput.h
+++ b/src/include/ngspice/fteinput.h
@@ -15,8 +15,8 @@ Author: 1988 Jeffrey M. Hsu
     checkup_option is for handling and pending asynchonous events
 */
 
-#ifndef ngspice_FTEINPUT_H_
-#define ngspice_FTEINPUT_H_
+#ifndef ngspice_FTEINPUT_H
+#define ngspice_FTEINPUT_H
 
 
 #include <stdio.h>
diff --git a/src/include/ngspice/fteoptdefs.h b/src/include/ngspice/fteoptdefs.h
index c0f22cd6c..98b5db026 100644
--- a/src/include/ngspice/fteoptdefs.h
+++ b/src/include/ngspice/fteoptdefs.h
@@ -2,8 +2,8 @@
 Author: 2010 Paolo Nenzi
 **********/
 
-#ifndef FTEOPT
-#define FTEOPT
+#ifndef ngspice_FTEOPTDEFS_H
+#define ngspice_FTEOPTDEFS_H
 
     /* Structure used to describe the frontend statistics to be collected */
     /* This is similar to the STATististics in optdefs.h but collects     */
diff --git a/src/include/ngspice/fteparse.h b/src/include/ngspice/fteparse.h
index 7c1369d2d..fb35b0fee 100644
--- a/src/include/ngspice/fteparse.h
+++ b/src/include/ngspice/fteparse.h
@@ -8,8 +8,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
  * Stuff for parsing -- used by the parser and in ft_evaluate().
  */
 
-#ifndef FTEPARSE
-#define FTEPARSE
+#ifndef ngspice_FTEPARSE_H
+#define ngspice_FTEPARSE_H
 
 
 #include "ngspice/cpstd.h"
diff --git a/src/include/ngspice/gendefs.h b/src/include/ngspice/gendefs.h
index cd209d218..f3eab5dd2 100644
--- a/src/include/ngspice/gendefs.h
+++ b/src/include/ngspice/gendefs.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef GEN
-#define GEN
+#ifndef ngspice_GENDEFS_H
+#define ngspice_GENDEFS_H
 
 #include "ngspice/typedefs.h"
 #include "ngspice/ifsim.h"
diff --git a/src/include/ngspice/gendev.h b/src/include/ngspice/gendev.h
index 5c74ff201..36029a163 100644
--- a/src/include/ngspice/gendev.h
+++ b/src/include/ngspice/gendev.h
@@ -7,8 +7,8 @@ Authors: 1992 David Gates
  * Version: 1b1
  */
 
-#ifndef GENDEV_H
-#define GENDEV_H
+#ifndef ngspice_GENDEV_H
+#define ngspice_GENDEV_H
 
 #include "ngspice/numenum.h"
 
diff --git a/src/include/ngspice/hash.h b/src/include/ngspice/hash.h
index 679454ba0..95aa5f8d1 100644
--- a/src/include/ngspice/hash.h
+++ b/src/include/ngspice/hash.h
@@ -6,8 +6,8 @@ CONTENTS:
 DATE:	    Jul 17, 1988 - original coding
 REVISIONS:  Aug 21, 2009 - adapted for ngspice
 ----------------------------------------------------------------- */
-#ifndef NGHASH_H
-#define NGHASH_H
+#ifndef ngspice_HASH_H
+#define ngspice_HASH_H
 
 #include "ngspice/bool.h"
 #include <stdint.h>
diff --git a/src/include/ngspice/iferrmsg.h b/src/include/ngspice/iferrmsg.h
index 77fff356a..c5532bdd4 100644
--- a/src/include/ngspice/iferrmsg.h
+++ b/src/include/ngspice/iferrmsg.h
@@ -6,8 +6,8 @@ Author: 1986 Thomas L. Quarles
 /*
  */
 
-#ifndef IFERRMSGS
-#define IFERRMSGS
+#ifndef ngspice_IFERRMSG_H
+#define ngspice_IFERRMSG_H
 
 
     /* common error message descriptions */
diff --git a/src/include/ngspice/ifsim.h b/src/include/ngspice/ifsim.h
index b7bf4fa18..47b328435 100644
--- a/src/include/ngspice/ifsim.h
+++ b/src/include/ngspice/ifsim.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1986 Thomas L. Quarles
 **********/
 
-#ifndef IFSIMULATOR
-#define IFSIMULATOR
+#ifndef ngspice_IFSIM_H
+#define ngspice_IFSIM_H
 
 #include "ngspice/typedefs.h"
 
diff --git a/src/include/ngspice/inpdefs.h b/src/include/ngspice/inpdefs.h
index 1d1bd91a3..a249466b2 100644
--- a/src/include/ngspice/inpdefs.h
+++ b/src/include/ngspice/inpdefs.h
@@ -4,8 +4,8 @@ Author: 1985 Thomas L. Quarles
 Modified: 2000 AlansFixes
 **********/
 
-#ifndef INP
-#define INP
+#ifndef ngspice_INPDEFS_H
+#define ngspice_INPDEFS_H
 
     /* structure declarations used by either/both input package */
 
diff --git a/src/include/ngspice/inpptree.h b/src/include/ngspice/inpptree.h
index 8dbfa032d..53781d2af 100644
--- a/src/include/ngspice/inpptree.h
+++ b/src/include/ngspice/inpptree.h
@@ -12,8 +12,8 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group
 
 #include "ngspice/ifsim.h"
 
-#ifndef INP_PARSE
-#define INP_PARSE
+#ifndef ngspice_INPPTREE_H
+#define ngspice_INPPTREE_H
 
 
 /* This is the parameter value passed to the device routines.  To get the
diff --git a/src/include/ngspice/ipc.h b/src/include/ngspice/ipc.h
index 62650b37d..ee3261797 100644
--- a/src/include/ngspice/ipc.h
+++ b/src/include/ngspice/ipc.h
@@ -37,8 +37,8 @@ NON-STANDARD FEATURES
 
 ============================================================================*/
 
-#ifndef IPC_DEFINED 
-#define IPC_DEFINED 
+#ifndef ngspice_IPC_H
+#define ngspice_IPC_H
 
 
 #define  IPC_MAX_LINE_LEN       80
diff --git a/src/include/ngspice/ipcproto.h b/src/include/ngspice/ipcproto.h
index 10f6cf7eb..aabd791d9 100644
--- a/src/include/ngspice/ipcproto.h
+++ b/src/include/ngspice/ipcproto.h
@@ -1,5 +1,5 @@
-#ifndef IPCPROTO_H
-#define IPCPROTO_H
+#ifndef ngspice_IPCPROTO_H
+#define ngspice_IPCPROTO_H
 
 /* IPC.c */
 Ipc_Boolean_t kw_match (char *keyword , char *str );
diff --git a/src/include/ngspice/ipctiein.h b/src/include/ngspice/ipctiein.h
index 70a0aeb47..8b20b9eee 100644
--- a/src/include/ngspice/ipctiein.h
+++ b/src/include/ngspice/ipctiein.h
@@ -37,8 +37,8 @@ NON-STANDARD FEATURES
 ============================================================================*/
 
 
-#ifndef IPC_TIEIN_DEFINED
-#define IPC_TIEIN_DEFINED
+#ifndef ngspice_IPCTIEIN_H
+#define ngspice_IPCTIEIN_H
 
 
 #include "ngspice/ipc.h"
diff --git a/src/include/ngspice/jobdefs.h b/src/include/ngspice/jobdefs.h
index aeaf8019c..a08772184 100644
--- a/src/include/ngspice/jobdefs.h
+++ b/src/include/ngspice/jobdefs.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef JOBdef
-#define JOBdef
+#ifndef ngspice_JOBDEFS_H
+#define ngspice_JOBDEFS_H
 
 
 #include "ngspice/typedefs.h"
diff --git a/src/include/ngspice/macros.h b/src/include/ngspice/macros.h
index 4d001b538..284edab31 100644
--- a/src/include/ngspice/macros.h
+++ b/src/include/ngspice/macros.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef ngspice_MACROS_H_
-#define ngspice_MACROS_H_
+#ifndef ngspice_MACROS_H
+#define ngspice_MACROS_H
 
 /*
  *  #define-s that are always on
diff --git a/src/include/ngspice/material.h b/src/include/ngspice/material.h
index 2c0951848..12b0b34a7 100644
--- a/src/include/ngspice/material.h
+++ b/src/include/ngspice/material.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef MATERIAL_H
-#define MATERIAL_H
+#ifndef ngspice_MATERIAL_H
+#define ngspice_MATERIAL_H
 
 #ifndef NUM_CARRIERS
 #include "ngspice/numenum.h"
diff --git a/src/include/ngspice/matldefs.h b/src/include/ngspice/matldefs.h
index e62a1f5e4..39142665d 100644
--- a/src/include/ngspice/matldefs.h
+++ b/src/include/ngspice/matldefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef MATL_H
-#define MATL_H
+#ifndef ngspice_MATLDEFS_H
+#define ngspice_MATLDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/meshdefs.h b/src/include/ngspice/meshdefs.h
index c4b7b296c..e650a53c0 100644
--- a/src/include/ngspice/meshdefs.h
+++ b/src/include/ngspice/meshdefs.h
@@ -7,8 +7,8 @@ Author:  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef MESH_H
-#define MESH_H
+#ifndef ngspice_MESHDEFS_H
+#define ngspice_MESHDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/meshext.h b/src/include/ngspice/meshext.h
index 72914125f..58010f8a2 100644
--- a/src/include/ngspice/meshext.h
+++ b/src/include/ngspice/meshext.h
@@ -10,8 +10,8 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 /**********
  Mesh Definitions and Declarations.
 **********/
-#ifndef MESHEXT_H
-#define MESHEXT_H
+#ifndef ngspice_MESHEXT_H
+#define ngspice_MESHEXT_H
 
 #include "ngspice/meshdefs.h"
 #include "ngspice/gendev.h"
diff --git a/src/include/ngspice/methdefs.h b/src/include/ngspice/methdefs.h
index a2757bd11..2d40c0ec9 100644
--- a/src/include/ngspice/methdefs.h
+++ b/src/include/ngspice/methdefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef METH_H
-#define METH_H
+#ifndef ngspice_METHDEFS_H
+#define ngspice_METHDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/mif.h b/src/include/ngspice/mif.h
index 674920ce4..b01488a1b 100644
--- a/src/include/ngspice/mif.h
+++ b/src/include/ngspice/mif.h
@@ -1,5 +1,5 @@
-#ifndef MIF
-#define MIF
+#ifndef ngspice_MIF_H
+#define ngspice_MIF_H
 
 /* ===========================================================================
 FILE    MIF.h
diff --git a/src/include/ngspice/mifcmdat.h b/src/include/ngspice/mifcmdat.h
index a33900d9d..655445a68 100644
--- a/src/include/ngspice/mifcmdat.h
+++ b/src/include/ngspice/mifcmdat.h
@@ -1,5 +1,5 @@
-#ifndef MIFCMDAT
-#define MIFCMDAT
+#ifndef ngspice_MIFCMDAT_H
+#define ngspice_MIFCMDAT_H
 
 /* ===========================================================================
 FILE    MIFcmdat.h
diff --git a/src/include/ngspice/mifdefs.h b/src/include/ngspice/mifdefs.h
index e2fa9bf70..c808854a6 100644
--- a/src/include/ngspice/mifdefs.h
+++ b/src/include/ngspice/mifdefs.h
@@ -1,5 +1,5 @@
-#ifndef MIFDEFS
-#define MIFDEFS
+#ifndef ngspice_MIFDEFS_H
+#define ngspice_MIFDEFS_H
 
 /* ===========================================================================
 FILE    MIFdefs.h
diff --git a/src/include/ngspice/mifparse.h b/src/include/ngspice/mifparse.h
index e8ef932c2..6d5171593 100644
--- a/src/include/ngspice/mifparse.h
+++ b/src/include/ngspice/mifparse.h
@@ -1,5 +1,5 @@
-#ifndef MIFPARSE
-#define MIFPARSE
+#ifndef ngspice_MIFPARSE_H
+#define ngspice_MIFPARSE_H
 
 /* ===========================================================================
 FILE    MIFparse.h
diff --git a/src/include/ngspice/mifproto.h b/src/include/ngspice/mifproto.h
index ebc953d67..cf8e24548 100644
--- a/src/include/ngspice/mifproto.h
+++ b/src/include/ngspice/mifproto.h
@@ -1,5 +1,5 @@
-#ifndef MIFPROTO
-#define MIFPROTO
+#ifndef ngspice_MIFPROTO_H
+#define ngspice_MIFPROTO_H
 
 /* ===========================================================================
 FILE    MIFproto.h
diff --git a/src/include/ngspice/miftypes.h b/src/include/ngspice/miftypes.h
index 7b5a2dcd0..92c48ed4e 100644
--- a/src/include/ngspice/miftypes.h
+++ b/src/include/ngspice/miftypes.h
@@ -1,5 +1,5 @@
-#ifndef MIFTYPES
-#define MIFTYPES
+#ifndef ngspice_MIFTYPES_H
+#define ngspice_MIFTYPES_H
 
 /* ===========================================================================
 FILE    MIFtypes.h
diff --git a/src/include/ngspice/missing_math.h b/src/include/ngspice/missing_math.h
index 84d1aea0b..4f9e2ee90 100644
--- a/src/include/ngspice/missing_math.h
+++ b/src/include/ngspice/missing_math.h
@@ -4,8 +4,8 @@ Copyright 1999 Emmanuel Rouat
 
 /* Decl. for missing maths functions, if any */
 
-#ifndef MISSING_MATH_H_INCLUDED
-#define MISSING_MATH_H_INCLUDED
+#ifndef ngspice_MISSING_MATH_H
+#define ngspice_MISSING_MATH_H
 
 bool AlmostEqualUlps(double, double, int);
 
diff --git a/src/include/ngspice/mobdefs.h b/src/include/ngspice/mobdefs.h
index 4aa6ea2b9..847450030 100644
--- a/src/include/ngspice/mobdefs.h
+++ b/src/include/ngspice/mobdefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef MOB_H
-#define MOB_H
+#ifndef ngspice_MOBDEFS_H
+#define ngspice_MOBDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/modldefs.h b/src/include/ngspice/modldefs.h
index fb2363379..b9f0da3a5 100644
--- a/src/include/ngspice/modldefs.h
+++ b/src/include/ngspice/modldefs.h
@@ -7,8 +7,8 @@ Authors :  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef MODL_H
-#define MODL_H
+#ifndef ngspice_MODLDEFS_H
+#define ngspice_MODLDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/ngspice.h b/src/include/ngspice/ngspice.h
index 602baffb4..6bce19347 100644
--- a/src/include/ngspice/ngspice.h
+++ b/src/include/ngspice/ngspice.h
@@ -2,8 +2,8 @@
  * Main header file for ngspice
  * 1999 E. Rouat
  ************/
-#ifndef NGSPICE_H_INCLUDED
-#define NGSPICE_H_INCLUDED
+#ifndef ngspice_NGSPICE_H
+#define ngspice_NGSPICE_H
 
 /* #include "memwatch.h"
  #define MEMWATCH */
diff --git a/src/include/ngspice/noisedef.h b/src/include/ngspice/noisedef.h
index 7957fb95e..effde5bfa 100644
--- a/src/include/ngspice/noisedef.h
+++ b/src/include/ngspice/noisedef.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1987 Gary W. Ng
 **********/
 
-#ifndef NOISEDEFS
-#define NOISEDEFS
+#ifndef ngspice_NOISEDEF_H
+#define ngspice_NOISEDEF_H
 
 #include "ngspice/jobdefs.h"
 
diff --git a/src/include/ngspice/numcards.h b/src/include/ngspice/numcards.h
index 3f956a0a4..2d6cbc013 100644
--- a/src/include/ngspice/numcards.h
+++ b/src/include/ngspice/numcards.h
@@ -10,8 +10,8 @@ Authors: 1991 David Gates
  * Version: 1b1
  */
  
-#ifndef NUMCARDS_H
-#define NUMCARDS_H
+#ifndef ngspice_NUMCARDS_H
+#define ngspice_NUMCARDS_H
 
 #include "ngspice/ifsim.h"
 
diff --git a/src/include/ngspice/numconst.h b/src/include/ngspice/numconst.h
index 72ca7afc0..52c14c2a0 100644
--- a/src/include/ngspice/numconst.h
+++ b/src/include/ngspice/numconst.h
@@ -10,8 +10,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
  * Version: 1b1
  */
  
-#ifndef NUMCONST_H
-#define NUMCONST_H
+#ifndef ngspice_NUMCONST_H
+#define ngspice_NUMCONST_H
 
 /* Mathematical Constants */
 #ifdef PI
diff --git a/src/include/ngspice/numenum.h b/src/include/ngspice/numenum.h
index 6a7344938..39c9ff6a0 100644
--- a/src/include/ngspice/numenum.h
+++ b/src/include/ngspice/numenum.h
@@ -11,8 +11,8 @@ Authors: 1991 David Gates
  */
 
 
-#ifndef NUMENUM_H
-#define NUMENUM_H
+#ifndef ngspice_NUMENUM_H
+#define ngspice_NUMENUM_H
 
 /* Doping Profiles */
 #define UNIF         101
diff --git a/src/include/ngspice/numgen.h b/src/include/ngspice/numgen.h
index 0117cabfd..72f8c5ac8 100644
--- a/src/include/ngspice/numgen.h
+++ b/src/include/ngspice/numgen.h
@@ -10,8 +10,8 @@ Authors: 1991 David Gates
 /*
  * Generic Numerical Model Structure
  */
-#ifndef NUMGEN_H
-#define NUMGEN_H
+#ifndef ngspice_NUMGEN_H
+#define ngspice_NUMGEN_H
 
 #include "ngspice/ifsim.h"
 #include "ngspice/cktdefs.h"
diff --git a/src/include/ngspice/numglobs.h b/src/include/ngspice/numglobs.h
index 9c4d4262f..490209b81 100644
--- a/src/include/ngspice/numglobs.h
+++ b/src/include/ngspice/numglobs.h
@@ -6,8 +6,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
 /* Define various flags, constants, and indices */
 /* These variables are defined in support/globals.c */
 
-#ifndef NUMGLOBS_H
-#define NUMGLOBS_H
+#ifndef ngspice_NUMGLOBS_H
+#define ngspice_NUMGLOBS_H
 
 extern int BandGapNarrowing;
 extern int TempDepMobility;
diff --git a/src/include/ngspice/onedev.h b/src/include/ngspice/onedev.h
index 38e714d95..a4b3a63e2 100644
--- a/src/include/ngspice/onedev.h
+++ b/src/include/ngspice/onedev.h
@@ -11,8 +11,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
  * One Dimensional Numerical Device Data Structures
  */
  
-#ifndef ONEDEV_H
-#define ONEDEV_H
+#ifndef ngspice_ONEDEV_H
+#define ngspice_ONEDEV_H
 
 #include "ngspice/gendev.h"
 #include "ngspice/smpdefs.h"
diff --git a/src/include/ngspice/onemesh.h b/src/include/ngspice/onemesh.h
index 653dd180f..41238f71e 100644
--- a/src/include/ngspice/onemesh.h
+++ b/src/include/ngspice/onemesh.h
@@ -11,8 +11,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
  * One-Dimensional Element-based Simulation-Mesh Data Structures 
  */
  
-#ifndef ONEMESH_H
-#define ONEMESH_H
+#ifndef ngspice_ONEMESH_H
+#define ngspice_ONEMESH_H
 
 #include "ngspice/material.h"
 
diff --git a/src/include/ngspice/opdefs.h b/src/include/ngspice/opdefs.h
index 33d7bcbeb..aa2f9e663 100644
--- a/src/include/ngspice/opdefs.h
+++ b/src/include/ngspice/opdefs.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef DCOP
-#define DCOP
+#ifndef ngspice_OPDEFS_H
+#define ngspice_OPDEFS_H
 
 
 #include "ngspice/cktdefs.h"
diff --git a/src/include/ngspice/optdefs.h b/src/include/ngspice/optdefs.h
index 0311ca897..3c968e455 100644
--- a/src/include/ngspice/optdefs.h
+++ b/src/include/ngspice/optdefs.h
@@ -4,8 +4,8 @@ Author: 1985 Thomas L. Quarles
 Modified: 2000 AlansFixes
 **********/
 
-#ifndef OPT
-#define OPT
+#ifndef ngspice_OPTDEFS_H
+#define ngspice_OPTDEFS_H
 
     /* structure used to describe the statistics to be collected */
 
diff --git a/src/include/ngspice/optndefs.h b/src/include/ngspice/optndefs.h
index 11144285a..602709541 100644
--- a/src/include/ngspice/optndefs.h
+++ b/src/include/ngspice/optndefs.h
@@ -7,8 +7,8 @@ Authors:  1991 David Gates
  * Version: 1b1
  */
 
-#ifndef OPTN_H
-#define OPTN_H
+#ifndef ngspice_OPTNDEFS_H
+#define ngspice_OPTNDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/outpdefs.h b/src/include/ngspice/outpdefs.h
index eba04bfd6..5049de7df 100644
--- a/src/include/ngspice/outpdefs.h
+++ b/src/include/ngspice/outpdefs.h
@@ -3,8 +3,8 @@ Copyright 1992 Regents of the University of California. All rights reserved.
 Authors:  1992 David Gates
 **********/
 
-#ifndef OUTP_H
-#define OUTP_H
+#ifndef ngspice_OUTPDEFS_H
+#define ngspice_OUTPDEFS_H
 
 /* Data Structures and Definitions for Device Simulation Cards */
 
diff --git a/src/include/ngspice/profile.h b/src/include/ngspice/profile.h
index 058f053df..027cf82c1 100644
--- a/src/include/ngspice/profile.h
+++ b/src/include/ngspice/profile.h
@@ -10,8 +10,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
 /*
  * Doping Profile Data Structures
  */
-#ifndef PROFILE_H
-#define PROFILE_H
+#ifndef ngspice_PROFILE_H
+#define ngspice_PROFILE_H
 
 typedef struct sDOPprofile {
     int type;                       /* Primary profile type UNIF, EXP, etc */
diff --git a/src/include/ngspice/pssdefs.h b/src/include/ngspice/pssdefs.h
index 03457808e..be97554d1 100644
--- a/src/include/ngspice/pssdefs.h
+++ b/src/include/ngspice/pssdefs.h
@@ -3,8 +3,8 @@ Author: 2010-05 Stefano Perticaroli ``spertica''
 Review: 2012-10 Francesco Lannutti
 **********/
 
-#ifndef PSS_H
-#define PSS_H
+#ifndef ngspice_PSSDEFS_H
+#define ngspice_PSSDEFS_H
 
 #include "ngspice/jobdefs.h"
 #include "ngspice/tskdefs.h"
diff --git a/src/include/ngspice/pzdefs.h b/src/include/ngspice/pzdefs.h
index e2e845350..46325f6fe 100644
--- a/src/include/ngspice/pzdefs.h
+++ b/src/include/ngspice/pzdefs.h
@@ -1,5 +1,5 @@
-#ifndef PZDEFS_H
-#define PZDEFS_H
+#ifndef ngspice_PZDEFS_H
+#define ngspice_PZDEFS_H
 
     /* structure used to describe an PZ analysis to be performed */
 
diff --git a/src/include/ngspice/sen2defs.h b/src/include/ngspice/sen2defs.h
index 8247af9f9..46c913a85 100644
--- a/src/include/ngspice/sen2defs.h
+++ b/src/include/ngspice/sen2defs.h
@@ -5,8 +5,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
  * SENdefs.h - structures for sensitivity package
  */
 
-#ifndef SENSTRUCTS
-#define SENSTRUCTS
+#ifndef ngspice_SEN2DEFS_H
+#define ngspice_SEN2DEFS_H
 
 
 #include "ngspice/smpdefs.h"
diff --git a/src/include/ngspice/sensdefs.h b/src/include/ngspice/sensdefs.h
index 8de2045dc..e25e023a3 100644
--- a/src/include/ngspice/sensdefs.h
+++ b/src/include/ngspice/sensdefs.h
@@ -2,8 +2,8 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 **********/
 
-#ifndef SENS_DEFS
-#define SENS_DEFS
+#ifndef ngspice_SENSDEFS_H
+#define ngspice_SENSDEFS_H
 
 #include "ngspice/jobdefs.h"
 
diff --git a/src/include/ngspice/smpdefs.h b/src/include/ngspice/smpdefs.h
index 24b32b4d1..bae1ad37a 100644
--- a/src/include/ngspice/smpdefs.h
+++ b/src/include/ngspice/smpdefs.h
@@ -1,5 +1,5 @@
-#ifndef SMP
-#define SMP
+#ifndef ngspice_SMPDEFS_H
+#define ngspice_SMPDEFS_H
 
 typedef  struct MatrixFrame     SMPmatrix;
 typedef  struct MatrixElement  *SMPelement;
diff --git a/src/include/ngspice/stringutil.h b/src/include/ngspice/stringutil.h
index de09438c5..cc7d2e1e1 100644
--- a/src/include/ngspice/stringutil.h
+++ b/src/include/ngspice/stringutil.h
@@ -6,8 +6,8 @@
 #include "ngspice/config.h"
 #include "ngspice/bool.h"
 
-#ifndef STRING_H_INCLUDED
-#define STRING_H_INCLUDED
+#ifndef ngspice_STRINGUTIL_H
+#define ngspice_STRINGUTIL_H
 
 int prefix(register char *p, register char *s);
 char * copy(const char *str);
diff --git a/src/include/ngspice/swec.h b/src/include/ngspice/swec.h
index 731157267..28c644fdd 100644
--- a/src/include/ngspice/swec.h
+++ b/src/include/ngspice/swec.h
@@ -10,8 +10,8 @@
  *  Copyright (C) University of California, Berkeley
  *
  */
-#ifndef ngspice_SWEC_H_
-#define ngspice_SWEC_H_
+#ifndef ngspice_SWEC_H
+#define ngspice_SWEC_H
 
 /************************************************************
  *
diff --git a/src/include/ngspice/tclspice.h b/src/include/ngspice/tclspice.h
index 472d49009..af5ad981c 100644
--- a/src/include/ngspice/tclspice.h
+++ b/src/include/ngspice/tclspice.h
@@ -1,6 +1,6 @@
 /*Include file to allow spice to export certain data */
-#ifndef TCLSPICE_H
-#define TCLSPICE_H
+#ifndef ngspice_TCLSPICE_H
+#define ngspice_TCLSPICE_H
 
 extern int steps_completed;
 extern void blt_init(void *run);
diff --git a/src/include/ngspice/tfdefs.h b/src/include/ngspice/tfdefs.h
index 45097d55a..45fccf971 100644
--- a/src/include/ngspice/tfdefs.h
+++ b/src/include/ngspice/tfdefs.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef TF
-#define TF
+#ifndef ngspice_TFDEFS_H
+#define ngspice_TFDEFS_H
 
 #include "ngspice/typedefs.h"
 #include "ngspice/jobdefs.h"
diff --git a/src/include/ngspice/trandefs.h b/src/include/ngspice/trandefs.h
index b138519c6..6822596df 100644
--- a/src/include/ngspice/trandefs.h
+++ b/src/include/ngspice/trandefs.h
@@ -4,8 +4,8 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 
-#ifndef TRAN
-#define TRAN
+#ifndef ngspice_TRANDEFS_H
+#define ngspice_TRANDEFS_H
 
 
 #include "ngspice/cktdefs.h"
diff --git a/src/include/ngspice/trcvdefs.h b/src/include/ngspice/trcvdefs.h
index 30a04ac05..e17aa9bf0 100644
--- a/src/include/ngspice/trcvdefs.h
+++ b/src/include/ngspice/trcvdefs.h
@@ -5,8 +5,8 @@ Modified: 1999 Paolo Nenzi
 **********/
 /*
  */
-#ifndef DCTR
-#define DCTR
+#ifndef ngspice_TRCVDEFS_H
+#define ngspice_TRCVDEFS_H
 
 
 #include "ngspice/jobdefs.h"
diff --git a/src/include/ngspice/tskdefs.h b/src/include/ngspice/tskdefs.h
index d4792cb0c..2c39c02ec 100644
--- a/src/include/ngspice/tskdefs.h
+++ b/src/include/ngspice/tskdefs.h
@@ -5,8 +5,8 @@ Modified: 2000 AlansFixes
 **********/
 /*
  */
-#ifndef TSK
-#define TSK
+#ifndef ngspice_TSKDEFS_H
+#define ngspice_TSKDEFS_H
 
 
 #include "ngspice/typedefs.h"
diff --git a/src/include/ngspice/twodev.h b/src/include/ngspice/twodev.h
index 635dbc67f..85fb33736 100644
--- a/src/include/ngspice/twodev.h
+++ b/src/include/ngspice/twodev.h
@@ -11,8 +11,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
  * Two-Dimensional Numerical Device Data Structures 
  */
   
-#ifndef TWODEV_H
-#define TWODEV_H
+#ifndef ngspice_TWODEV_H
+#define ngspice_TWODEV_H
 
 #include "ngspice/gendev.h"
 #include "ngspice/smpdefs.h"
diff --git a/src/include/ngspice/twomesh.h b/src/include/ngspice/twomesh.h
index 0173113b9..c6f6cf662 100644
--- a/src/include/ngspice/twomesh.h
+++ b/src/include/ngspice/twomesh.h
@@ -11,8 +11,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
  * Two-Dimensional Element-based Simulation-Mesh Data Structures 
  */
  
-#ifndef TWOMESH_H
-#define TWOMESH_H
+#ifndef ngspice_TWOMESH_H
+#define ngspice_TWOMESH_H
 
 #include "ngspice/material.h"
 
diff --git a/src/include/ngspice/typedefs.h b/src/include/ngspice/typedefs.h
index 45ea51988..332017bc8 100644
--- a/src/include/ngspice/typedefs.h
+++ b/src/include/ngspice/typedefs.h
@@ -3,8 +3,8 @@
  * and central typedefs which are not allowed to be repeated
  */
 
-#ifndef TYPEDEFS_H_INCLUDED
-#define TYPEDEFS_H_INCLUDED
+#ifndef ngspice_TYPEDEFS_H
+#define ngspice_TYPEDEFS_H
 
 
 typedef struct CKTcircuit CKTcircuit;
diff --git a/src/include/ngspice/wstdio.h b/src/include/ngspice/wstdio.h
index ca50e9981..9e4471d7d 100644
--- a/src/include/ngspice/wstdio.h
+++ b/src/include/ngspice/wstdio.h
@@ -3,8 +3,8 @@
 	Stand: 21.05.95
 */
 
-#ifndef WSTDIO_H
-#define WSTDIO_H
+#ifndef ngspice_WSTDIO_H
+#define ngspice_WSTDIO_H
 #include <stdio.h>				/* original definitions */
 
 #undef getc					/* old macros removed */
diff --git a/src/maths/cmaths/cmath1.h b/src/maths/cmaths/cmath1.h
index 050d2b276..7855f68dc 100644
--- a/src/maths/cmaths/cmath1.h
+++ b/src/maths/cmaths/cmath1.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CMATH1_H_INCLUDED
-#define CMATH1_H_INCLUDED
+#ifndef ngspice_CMATH1_H
+#define ngspice_CMATH1_H
 
 
 void * cx_mag(void *data, short int type, int length, int *newlength, short int *newtype);
diff --git a/src/maths/cmaths/cmath2.h b/src/maths/cmaths/cmath2.h
index 2c9e7efe1..0ecc2f21d 100644
--- a/src/maths/cmaths/cmath2.h
+++ b/src/maths/cmaths/cmath2.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CMATH2_H_INCLUDED
-#define CMATH2_H_INCLUDED
+#ifndef ngspice_CMATH2_H
+#define ngspice_CMATH2_H
 
 
 
diff --git a/src/maths/cmaths/cmath3.h b/src/maths/cmaths/cmath3.h
index a657a827d..4cb2eefcc 100644
--- a/src/maths/cmaths/cmath3.h
+++ b/src/maths/cmaths/cmath3.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CMATH3_H_INCLUDED
-#define CMATH3_H_INCLUDED
+#ifndef ngspice_CMATH3_H
+#define ngspice_CMATH3_H
 
 
 void * cx_divide(void *data1, void *data2, short int datatype1, short int datatype2, int length);
diff --git a/src/maths/cmaths/cmath4.h b/src/maths/cmaths/cmath4.h
index b08ef4258..9dc7c4666 100644
--- a/src/maths/cmaths/cmath4.h
+++ b/src/maths/cmaths/cmath4.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef CMATH4_H_INCLUDED
-#define CMATH4_H_INCLUDED
+#ifndef ngspice_CMATH4_H
+#define ngspice_CMATH4_H
 
 void * cx_and(void *data1, void *data2, short int datatype1, short int datatype2, int length);
 void * cx_or(void *data1, void *data2, short int datatype1, short int datatype2, int length);
diff --git a/src/maths/misc/accuracy.h b/src/maths/misc/accuracy.h
index 162f18ae6..23da19b90 100644
--- a/src/maths/misc/accuracy.h
+++ b/src/maths/misc/accuracy.h
@@ -3,8 +3,8 @@ Copyright 1991 Regents of the University of California. All rights reserved.
 Authors: 1987 Karti Mayaram, 1991 David Gates
 **********/
 
-#ifndef ACCURACY_H
-#define ACCURACY_H
+#ifndef ngspice_ACCURACY_H
+#define ngspice_ACCURACY_H
 
 /*
  * Definitions of Globals for Machine Accuracy Limits
diff --git a/src/maths/misc/bernoull.h b/src/maths/misc/bernoull.h
index 5716d032f..5a6919cb1 100644
--- a/src/maths/misc/bernoull.h
+++ b/src/maths/misc/bernoull.h
@@ -6,8 +6,8 @@
  * Bernoulli function
  */
  
-#ifndef BERNOULL_H
-#define BERNOULL_H
+#ifndef ngspice_BERNOULL_H
+#define ngspice_BERNOULL_H
 
 extern void bernoulli (double, double *, double *, double *, 
                        double *, BOOLEAN);
diff --git a/src/maths/misc/norm.h b/src/maths/misc/norm.h
index d331a2ab1..c73e15f47 100644
--- a/src/maths/misc/norm.h
+++ b/src/maths/misc/norm.h
@@ -6,8 +6,8 @@
  * Bernoulli function
  */
  
-#ifndef NORM_H
-#define NORM_H
+#ifndef ngspice_NORM_H
+#define ngspice_NORM_H
 
 extern double maxNorm(double *, int);
 extern double oneNorm(double *, int);
diff --git a/src/maths/sparse/spconfig.h b/src/maths/sparse/spconfig.h
index c946368f5..7ded25e82 100644
--- a/src/maths/sparse/spconfig.h
+++ b/src/maths/sparse/spconfig.h
@@ -34,8 +34,8 @@
  */
 
 
-#ifndef spCONFIG_DEFS
-#define spCONFIG_DEFS
+#ifndef ngspice_SPCONFIG_H
+#define ngspice_SPCONFIG_H
 
 
 
diff --git a/src/misc/alloc.h b/src/misc/alloc.h
index 1b7b25548..083106c4d 100644
--- a/src/misc/alloc.h
+++ b/src/misc/alloc.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef ALLOC_H_INCLUDED
-#define ALLOC_H_INCLUDED
+#ifndef ngspice_ALLOC_H
+#define ngspice_ALLOC_H
 
 #ifndef HAVE_LIBGC
 void * tmalloc(size_t num);
diff --git a/src/misc/dup2.h b/src/misc/dup2.h
index 37462f014..6fc2669c2 100644
--- a/src/misc/dup2.h
+++ b/src/misc/dup2.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef DUP2_H_INCLUDED
-#define DUP2_H_INCLUDED
+#ifndef ngspice_DUP2_H
+#define ngspice_DUP2_H
 
 #ifndef HAVE_DUP2
 
diff --git a/src/misc/ivars.h b/src/misc/ivars.h
index 51e4e22c9..81dbbd265 100644
--- a/src/misc/ivars.h
+++ b/src/misc/ivars.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef IVARS_H_INCLUDED
-#define IVARS_H_INCLUDED
+#ifndef ngspice_IVARS_H
+#define ngspice_IVARS_H
 
 
 void ivars(char*);
diff --git a/src/misc/misc_time.h b/src/misc/misc_time.h
index fe0ff4eba..0424554a0 100644
--- a/src/misc/misc_time.h
+++ b/src/misc/misc_time.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef MISC_TIME_H_INCLUDED
-#define MISC_TIME_H_INCLUDED
+#ifndef ngspice_MISC_TIME_H
+#define ngspice_MISC_TIME_H
 
 char * datestring(void);
 double seconds(void);
diff --git a/src/misc/mktemp.h b/src/misc/mktemp.h
index 995d54aec..655e7344a 100644
--- a/src/misc/mktemp.h
+++ b/src/misc/mktemp.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef MKTEMP_H_INCLUDED
-#define MKTEMP_H_INCLUDED
+#ifndef ngspice_MKTEMP_H
+#define ngspice_MKTEMP_H
 
 char * smktemp(char *id);
 
diff --git a/src/misc/printnum.h b/src/misc/printnum.h
index e405c69db..b569c77fc 100644
--- a/src/misc/printnum.h
+++ b/src/misc/printnum.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef PRINTNUM_H_INCLUDED
-#define PRINTNUM_H_INCLUDED
+#ifndef ngspice_PRINTNUM_H
+#define ngspice_PRINTNUM_H
 
 void printnum(char * buf, double num);
 
diff --git a/src/misc/tilde.h b/src/misc/tilde.h
index 83cd8f72c..19dd519af 100644
--- a/src/misc/tilde.h
+++ b/src/misc/tilde.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef TILDE_H_INCLUDED
-#define TILDE_H_INCLUDED
+#ifndef ngspice_TILDE_H
+#define ngspice_TILDE_H
 
 char * tildexpand(char *string);
 
diff --git a/src/misc/util.h b/src/misc/util.h
index 2c59d3025..932767212 100644
--- a/src/misc/util.h
+++ b/src/misc/util.h
@@ -3,8 +3,8 @@
  * 2002 R. Oktas, <roktas@omu.edu.tr>
  ************/
 
-#ifndef UTIL_H_INCLUDED
-#define UTIL_H_INCLUDED
+#ifndef ngspice_UTIL_H
+#define ngspice_UTIL_H
 
 char *canonicalize_pathname(char *path);
 char *absolute_pathname(char *string, char *dot_path);
diff --git a/src/spicelib/parser/inpxx.h b/src/spicelib/parser/inpxx.h
index 9c679d9a7..1a26ed4a1 100644
--- a/src/spicelib/parser/inpxx.h
+++ b/src/spicelib/parser/inpxx.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef INP_H_INCLUDED
-#define INP_H_INCLUDED
+#ifndef ngspice_INPXX_H
+#define ngspice_INPXX_H
 
 /* inp2xx.c */