From 805753d28c9b1d2fd784c32ff335fe049969423d Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 22 Jan 2013 21:00:29 +0100
Subject: [PATCH] avoid leading underscore in preprocessor macros

---
 src/ciderlib/oned/oneddefs.h     | 4 ++--
 src/ciderlib/oned/onedext.h      | 4 ++--
 src/ciderlib/twod/twoddefs.h     | 4 ++--
 src/ciderlib/twod/twodext.h      | 4 ++--
 src/frontend/com_ahelp.h         | 4 ++--
 src/frontend/com_asciiplot.h     | 4 ++--
 src/frontend/com_cdump.h         | 4 ++--
 src/frontend/com_commands.h      | 4 ++--
 src/frontend/com_compose.h       | 4 ++--
 src/frontend/com_display.h       | 4 ++--
 src/frontend/com_dl.h            | 4 ++--
 src/frontend/com_dump.h          | 4 ++--
 src/frontend/com_ghelp.h         | 4 ++--
 src/frontend/com_gnuplot.h       | 4 ++--
 src/frontend/com_hardcopy.h      | 4 ++--
 src/frontend/com_help.h          | 4 ++--
 src/frontend/com_history.h       | 4 ++--
 src/frontend/com_let.h           | 4 ++--
 src/frontend/com_measure2.h      | 4 ++--
 src/frontend/com_option.h        | 4 ++--
 src/frontend/com_plot.h          | 4 ++--
 src/frontend/com_set.h           | 4 ++--
 src/frontend/com_setscale.h      | 4 ++--
 src/frontend/com_state.h         | 4 ++--
 src/frontend/com_strcmp.h        | 4 ++--
 src/frontend/com_xgraph.h        | 4 ++--
 src/frontend/commands.h          | 4 ++--
 src/frontend/completion.h        | 4 ++--
 src/frontend/diff.h              | 4 ++--
 src/frontend/evaluate.h          | 4 ++--
 src/frontend/hcomp.h             | 4 ++--
 src/frontend/init.h              | 4 ++--
 src/frontend/parse.h             | 4 ++--
 src/frontend/plotting/agraf.h    | 4 ++--
 src/frontend/plotting/plotit.h   | 4 ++--
 src/frontend/plotting/plotting.h | 4 ++--
 src/frontend/plotting/pvec.h     | 4 ++--
 src/frontend/terminal.h          | 4 ++--
 src/frontend/variable.h          | 4 ++--
 src/include/ngspice/bool.h       | 4 ++--
 src/include/ngspice/ciderinp.h   | 4 ++--
 src/include/ngspice/cidersupt.h  | 4 ++--
 src/include/ngspice/cluster.h    | 4 ++--
 src/include/ngspice/compatmode.h | 4 ++--
 src/include/ngspice/complex.h    | 8 ++++----
 src/include/ngspice/cpstd.h      | 4 ++--
 src/include/ngspice/defines.h    | 4 ++--
 src/include/ngspice/dllitf.h     | 4 ++--
 src/include/ngspice/dvec.h       | 4 ++--
 src/include/ngspice/fteinput.h   | 4 ++--
 src/include/ngspice/graph.h      | 4 ++--
 src/include/ngspice/grid.h       | 4 ++--
 src/include/ngspice/macros.h     | 4 ++--
 src/include/ngspice/memory.h     | 4 ++--
 src/include/ngspice/plot.h       | 4 ++--
 src/include/ngspice/pnode.h      | 4 ++--
 src/include/ngspice/sim.h        | 4 ++--
 src/include/ngspice/sperror.h    | 4 ++--
 src/include/ngspice/swec.h       | 4 ++--
 src/include/ngspice/wordlist.h   | 4 ++--
 src/maths/cmaths/cmath.h         | 4 ++--
 src/maths/poly/interpolate.h     | 4 ++--
 src/maths/poly/poly.h            | 4 ++--
 src/maths/poly/polyderiv.h       | 4 ++--
 src/maths/poly/polyeval.h        | 4 ++--
 src/maths/poly/polyfit.h         | 4 ++--
 src/maths/sparse/spdefs.h        | 4 ++--
 src/spicelib/analysis/analysis.h | 4 ++--
 src/spicelib/parser/inppas1.h    | 4 ++--
 src/spicelib/parser/inppas2.h    | 4 ++--
 src/spicelib/parser/inppas3.h    | 4 ++--
 71 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/src/ciderlib/oned/oneddefs.h b/src/ciderlib/oned/oneddefs.h
index cc36efa50..e8e93b156 100644
--- a/src/ciderlib/oned/oneddefs.h
+++ b/src/ciderlib/oned/oneddefs.h
@@ -2,8 +2,8 @@
  * 2001 Paolo Nenzi
  */
  
-#ifndef _ONEDDEFS_H
-#define _ONEDDEFS_H
+#ifndef ngspice_ONEDDEFS_H
+#define ngspice_ONEDDEFS_H
 
 /* Debug statements */
 
diff --git a/src/ciderlib/oned/onedext.h b/src/ciderlib/oned/onedext.h
index 428b31bad..9cd828d1c 100644
--- a/src/ciderlib/oned/onedext.h
+++ b/src/ciderlib/oned/onedext.h
@@ -4,8 +4,8 @@
  
  /* External symbols for ONE Dimensional simulator */
 
-#ifndef _ONEDEXT_H
-#define _ONEDEXT_H
+#ifndef ngspice_ONEDEXT_H
+#define ngspice_ONEDEXT_H
 
 #include "ngspice/profile.h"
 #include "ngspice/onemesh.h"
diff --git a/src/ciderlib/twod/twoddefs.h b/src/ciderlib/twod/twoddefs.h
index c63326549..349940f33 100644
--- a/src/ciderlib/twod/twoddefs.h
+++ b/src/ciderlib/twod/twoddefs.h
@@ -2,8 +2,8 @@
  * 2001 Paolo Nenzi
  */
  
-#ifndef _TWODDEFS_H
-#define _TWODDEFS_H
+#ifndef ngspice_TWODDEFS_H
+#define ngspice_TWODDEFS_H
 
 /* Debug statements */
 
diff --git a/src/ciderlib/twod/twodext.h b/src/ciderlib/twod/twodext.h
index d8007e855..6a8330536 100644
--- a/src/ciderlib/twod/twodext.h
+++ b/src/ciderlib/twod/twodext.h
@@ -4,8 +4,8 @@
  
  /* External symbols for Two Dimensional simulator */
  
-#ifndef _TWODEXT_H
-#define _TWODEXT_H
+#ifndef ngspice_TWODEXT_H
+#define ngspice_TWODEXT_H
 
 #include "ngspice/profile.h"
 #include "ngspice/twomesh.h"
diff --git a/src/frontend/com_ahelp.h b/src/frontend/com_ahelp.h
index e246cec01..0b1fd3007 100644
--- a/src/frontend/com_ahelp.h
+++ b/src/frontend/com_ahelp.h
@@ -1,5 +1,5 @@
-#ifndef _COM_AHELP_H
-#define _COM_AHELP_H
+#ifndef ngspice_COM_AHELP_H
+#define ngspice_COM_AHELP_H
 
 
 void com_ahelp(wordlist *wl);
diff --git a/src/frontend/com_asciiplot.h b/src/frontend/com_asciiplot.h
index b502c33be..27f75d679 100644
--- a/src/frontend/com_asciiplot.h
+++ b/src/frontend/com_asciiplot.h
@@ -1,5 +1,5 @@
-#ifndef _COM_ASCIIPLOT_H
-#define _COM_ASCIIPLOT_H
+#ifndef ngspice_COM_ASCIIPLOT_H
+#define ngspice_COM_ASCIIPLOT_H
 
 void com_asciiplot(wordlist *wl);
 
diff --git a/src/frontend/com_cdump.h b/src/frontend/com_cdump.h
index 3a859a4b5..00e88dec1 100644
--- a/src/frontend/com_cdump.h
+++ b/src/frontend/com_cdump.h
@@ -1,5 +1,5 @@
-#ifndef _COM_CDUMP_H
-#define _COM_CDUMP_H
+#ifndef ngspice_COM_CDUMP_H
+#define ngspice_COM_CDUMP_H
 
 void com_cdump(wordlist *wl);
 void com_mdump(wordlist *wl);
diff --git a/src/frontend/com_commands.h b/src/frontend/com_commands.h
index f9e296482..089e4537e 100644
--- a/src/frontend/com_commands.h
+++ b/src/frontend/com_commands.h
@@ -1,5 +1,5 @@
-#ifndef _COM_COMMANDS_H
-#define _COM_COMMANDS_H
+#ifndef ngspice_COM_COMMANDS_H
+#define ngspice_COM_COMMANDS_H
 
 void com_showmod(wordlist *wl);
 void com_show(wordlist *wl);
diff --git a/src/frontend/com_compose.h b/src/frontend/com_compose.h
index 66caa69d9..f8c7a87a2 100644
--- a/src/frontend/com_compose.h
+++ b/src/frontend/com_compose.h
@@ -1,6 +1,6 @@
 
-#ifndef _COM_COMPOSE_H
-#define _COM_COMPOSE_H
+#ifndef ngspice_COM_COMPOSE_H
+#define ngspice_COM_COMPOSE_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_display.h b/src/frontend/com_display.h
index 8831767c0..3222b3ccc 100644
--- a/src/frontend/com_display.h
+++ b/src/frontend/com_display.h
@@ -1,5 +1,5 @@
-#ifndef _COM_DISPLAY_H
-#define _COM_DISPLAY_H
+#ifndef ngspice_COM_DISPLAY_H
+#define ngspice_COM_DISPLAY_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_dl.h b/src/frontend/com_dl.h
index 45f479bb8..646bc6ae4 100644
--- a/src/frontend/com_dl.h
+++ b/src/frontend/com_dl.h
@@ -1,5 +1,5 @@
-#ifndef _COM_DL_H
-#define _COM_DL_H 1
+#ifndef ngspice_COM_DL_H
+#define ngspice_COM_DL_H 1
 
 #ifdef XSPICE
 void com_codemodel(wordlist *wl);
diff --git a/src/frontend/com_dump.h b/src/frontend/com_dump.h
index 36441e406..c94e7adb5 100644
--- a/src/frontend/com_dump.h
+++ b/src/frontend/com_dump.h
@@ -1,5 +1,5 @@
-#ifndef _COM_DUMP_H
-#define _COM_DUMP_H
+#ifndef ngspice_COM_DUMP_H
+#define ngspice_COM_DUMP_H
 
 void com_dump(wordlist *wl);
 
diff --git a/src/frontend/com_ghelp.h b/src/frontend/com_ghelp.h
index 8fb3667f5..55e8335fa 100644
--- a/src/frontend/com_ghelp.h
+++ b/src/frontend/com_ghelp.h
@@ -1,5 +1,5 @@
-#ifndef _COM_GHELP_H
-#define _COM_GHELP_H
+#ifndef ngspice_COM_GHELP_H
+#define ngspice_COM_GHELP_H
 
 
 void com_ghelp(wordlist *wl);
diff --git a/src/frontend/com_gnuplot.h b/src/frontend/com_gnuplot.h
index 122cd744a..a3783ec9c 100644
--- a/src/frontend/com_gnuplot.h
+++ b/src/frontend/com_gnuplot.h
@@ -1,5 +1,5 @@
-#ifndef _COM_GNUPLOT_H
-#define _COM_GNUPLOT_H
+#ifndef ngspice_COM_GNUPLOT_H
+#define ngspice_COM_GNUPLOT_H
 
 void com_gnuplot(wordlist *wl);
 void com_write_simple(wordlist *wl);
diff --git a/src/frontend/com_hardcopy.h b/src/frontend/com_hardcopy.h
index 67aa5d129..d62ef0977 100644
--- a/src/frontend/com_hardcopy.h
+++ b/src/frontend/com_hardcopy.h
@@ -1,5 +1,5 @@
-#ifndef _COM_HARDCOPY_H
-#define _COM_HARDCOPY_H
+#ifndef ngspice_COM_HARDCOPY_H
+#define ngspice_COM_HARDCOPY_H
 
 
 void com_hardcopy(wordlist *wl);
diff --git a/src/frontend/com_help.h b/src/frontend/com_help.h
index d0ab82428..b52e2f578 100644
--- a/src/frontend/com_help.h
+++ b/src/frontend/com_help.h
@@ -1,5 +1,5 @@
-#ifndef _COM_HELP_H
-#define _COM_HELP_H
+#ifndef ngspice_COM_HELP_H
+#define ngspice_COM_HELP_H
 
 
 void com_help(wordlist *wl);
diff --git a/src/frontend/com_history.h b/src/frontend/com_history.h
index 2f9ce4994..2958f50bd 100644
--- a/src/frontend/com_history.h
+++ b/src/frontend/com_history.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef _COM_HISTORY_H
-#define _COM_HISTORY_H
+#ifndef ngspice_COM_HISTORY_H
+#define ngspice_COM_HISTORY_H
 
 void com_history(wordlist *wl);
 
diff --git a/src/frontend/com_let.h b/src/frontend/com_let.h
index 82f2941de..f61e79fee 100644
--- a/src/frontend/com_let.h
+++ b/src/frontend/com_let.h
@@ -1,5 +1,5 @@
-#ifndef _COM_LET_H
-#define _COM_LET_H
+#ifndef ngspice_COM_LET_H
+#define ngspice_COM_LET_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_measure2.h b/src/frontend/com_measure2.h
index e8be0fff0..cbada3cb4 100644
--- a/src/frontend/com_measure2.h
+++ b/src/frontend/com_measure2.h
@@ -1,5 +1,5 @@
-#ifndef _COM_MEASURE2_H
-#define _COM_MEASURE2_H
+#ifndef ngspice_COM_MEASURE2_H
+#define ngspice_COM_MEASURE2_H
 
 
 extern int measure_get_precision(void);
diff --git a/src/frontend/com_option.h b/src/frontend/com_option.h
index ef3163db0..af872911b 100644
--- a/src/frontend/com_option.h
+++ b/src/frontend/com_option.h
@@ -1,5 +1,5 @@
-#ifndef _COM_OPTION_H
-#define _COM_OPTION_H
+#ifndef ngspice_COM_OPTION_H
+#define ngspice_COM_OPTION_H
 
 void com_option(wordlist *wl);
 
diff --git a/src/frontend/com_plot.h b/src/frontend/com_plot.h
index 7599e75a3..e8ef7c22a 100644
--- a/src/frontend/com_plot.h
+++ b/src/frontend/com_plot.h
@@ -1,5 +1,5 @@
-#ifndef _COM_PLOT_H
-#define _COM_PLOT_H
+#ifndef ngspice_COM_PLOT_H
+#define ngspice_COM_PLOT_H
 
 void com_plot(wordlist *wl);
 #ifdef TCL_MODULE
diff --git a/src/frontend/com_set.h b/src/frontend/com_set.h
index 00b929447..45e581b6c 100644
--- a/src/frontend/com_set.h
+++ b/src/frontend/com_set.h
@@ -1,5 +1,5 @@
-#ifndef _COM_SET_H
-#define _COM_SET_H
+#ifndef ngspice_COM_SET_H
+#define ngspice_COM_SET_H
 
 void com_set(wordlist *wl);
 
diff --git a/src/frontend/com_setscale.h b/src/frontend/com_setscale.h
index 2a502a19b..222e88c62 100644
--- a/src/frontend/com_setscale.h
+++ b/src/frontend/com_setscale.h
@@ -1,5 +1,5 @@
-#ifndef _COM_SETSCALE_H
-#define _COM_SETSCALE_H
+#ifndef ngspice_COM_SETSCALE_H
+#define ngspice_COM_SETSCALE_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/com_state.h b/src/frontend/com_state.h
index 08955a500..1ba2a2119 100644
--- a/src/frontend/com_state.h
+++ b/src/frontend/com_state.h
@@ -1,5 +1,5 @@
-#ifndef _COM_STATE_H
-#define _COM_STATE_H
+#ifndef ngspice_COM_STATE_H
+#define ngspice_COM_STATE_H
 
 void com_state(wordlist *wl);
 
diff --git a/src/frontend/com_strcmp.h b/src/frontend/com_strcmp.h
index e94bfbe16..cdaeaffda 100644
--- a/src/frontend/com_strcmp.h
+++ b/src/frontend/com_strcmp.h
@@ -1,5 +1,5 @@
-#ifndef _COM_STRCMP_H
-#define _COM_STRCMP_H
+#ifndef ngspice_COM_STRCMP_H
+#define ngspice_COM_STRCMP_H
 
 
 void com_strcmp(wordlist *wl);
diff --git a/src/frontend/com_xgraph.h b/src/frontend/com_xgraph.h
index ef0ac2116..8694a7113 100644
--- a/src/frontend/com_xgraph.h
+++ b/src/frontend/com_xgraph.h
@@ -1,5 +1,5 @@
-#ifndef _COM_XGRAPH_H
-#define _COM_XGRAPH_H
+#ifndef ngspice_COM_XGRAPH_H
+#define ngspice_COM_XGRAPH_H
 
 void com_xgraph(wordlist *wl);
 
diff --git a/src/frontend/commands.h b/src/frontend/commands.h
index a26246336..2e716aa7a 100644
--- a/src/frontend/commands.h
+++ b/src/frontend/commands.h
@@ -1,5 +1,5 @@
-#ifndef _COMMANDS_H
-#define _COMMANDS_H
+#ifndef ngspice_COMMANDS_H
+#define ngspice_COMMANDS_H
 
 
 extern struct comm spcp_coms[];
diff --git a/src/frontend/completion.h b/src/frontend/completion.h
index c02334ed7..0e52e2755 100644
--- a/src/frontend/completion.h
+++ b/src/frontend/completion.h
@@ -1,5 +1,5 @@
-#ifndef _COMPLETION_H
-#define _COMPLETION_H
+#ifndef ngspice_COMPLETION_H
+#define ngspice_COMPLETION_H
 
 /* The types for command completion keywords. Note that these
  * constants are built into cmdtab.c, so DON'T change them unless you
diff --git a/src/frontend/diff.h b/src/frontend/diff.h
index 27568a740..de451d28b 100644
--- a/src/frontend/diff.h
+++ b/src/frontend/diff.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef _DIFF_H
-#define _DIFF_H
+#ifndef ngspice_DIFF_H
+#define ngspice_DIFF_H
 
 #include "ngspice/wordlist.h"
 
diff --git a/src/frontend/evaluate.h b/src/frontend/evaluate.h
index 37d00b172..aa6a67068 100644
--- a/src/frontend/evaluate.h
+++ b/src/frontend/evaluate.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef _EVALUATE_H
-#define _EVALUATE_H
+#ifndef ngspice_EVALUATE_H
+#define ngspice_EVALUATE_H
 
 #include "ngspice/dvec.h"
 #include "ngspice/pnode.h"
diff --git a/src/frontend/hcomp.h b/src/frontend/hcomp.h
index eed3558b8..1fa4050da 100644
--- a/src/frontend/hcomp.h
+++ b/src/frontend/hcomp.h
@@ -1,5 +1,5 @@
-#ifndef _HCOMP_H
-#define _HCOMP_H
+#ifndef ngspice_HCOMP_H
+#define ngspice_HCOMP_H
 
 
 int hcomp(const void *a, const void *b);
diff --git a/src/frontend/init.h b/src/frontend/init.h
index 2544db117..88054965e 100644
--- a/src/frontend/init.h
+++ b/src/frontend/init.h
@@ -1,5 +1,5 @@
-#ifndef _INIT_H
-#define _INIT_H
+#ifndef ngspice_INIT_H
+#define ngspice_INIT_H
 
 
 
diff --git a/src/frontend/parse.h b/src/frontend/parse.h
index 707d6231b..306b0c456 100644
--- a/src/frontend/parse.h
+++ b/src/frontend/parse.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef _PARSE_H
-#define _PARSE_H
+#ifndef ngspice_PARSE_H
+#define ngspice_PARSE_H
 
 #include "ngspice/pnode.h"
 #include "ngspice/wordlist.h"
diff --git a/src/frontend/plotting/agraf.h b/src/frontend/plotting/agraf.h
index e7b9f1904..8ce9e24aa 100644
--- a/src/frontend/plotting/agraf.h
+++ b/src/frontend/plotting/agraf.h
@@ -3,8 +3,8 @@
  * 1999 E. Rouat
  ************/
 
-#ifndef _AGRAF_H
-#define _AGRAF_H
+#ifndef ngspice_AGRAF_H
+#define ngspice_AGRAF_H
 
 #include "ngspice/dvec.h"
 #include "ngspice/bool.h"
diff --git a/src/frontend/plotting/plotit.h b/src/frontend/plotting/plotit.h
index 17742effb..2ca853afc 100644
--- a/src/frontend/plotting/plotit.h
+++ b/src/frontend/plotting/plotit.h
@@ -1,5 +1,5 @@
-#ifndef _PLOTIT_H
-#define _PLOTIT_H
+#ifndef ngspice_PLOTIT_H
+#define ngspice_PLOTIT_H
 
 bool plotit(wordlist *wl, char *hcopy, char *devname);
 
diff --git a/src/frontend/plotting/plotting.h b/src/frontend/plotting/plotting.h
index ba091abf4..a4c4a6982 100644
--- a/src/frontend/plotting/plotting.h
+++ b/src/frontend/plotting/plotting.h
@@ -1,5 +1,5 @@
-#ifndef _PLOTTING_H
-#define _PLOTTING_H
+#ifndef ngspice_PLOTTING_H
+#define ngspice_PLOTTING_H
 
 #include "ngspice/plot.h"
 
diff --git a/src/frontend/plotting/pvec.h b/src/frontend/plotting/pvec.h
index 0e2f30c58..9d59eb099 100644
--- a/src/frontend/plotting/pvec.h
+++ b/src/frontend/plotting/pvec.h
@@ -1,5 +1,5 @@
-#ifndef _PVEC_H
-#define _PVEC_H
+#ifndef ngspice_PVEC_H
+#define ngspice_PVEC_H
 
 #include "ngspice/dvec.h"
 
diff --git a/src/frontend/terminal.h b/src/frontend/terminal.h
index 3cbdf0270..0b822e7e0 100644
--- a/src/frontend/terminal.h
+++ b/src/frontend/terminal.h
@@ -1,5 +1,5 @@
-#ifndef _TERMINAL_H
-#define _TERMINAL_H
+#ifndef ngspice_TERMINAL_H
+#define ngspice_TERMINAL_H
 
 
 void outbufputc(void);
diff --git a/src/frontend/variable.h b/src/frontend/variable.h
index 27e80d5c8..313d7622d 100644
--- a/src/frontend/variable.h
+++ b/src/frontend/variable.h
@@ -2,8 +2,8 @@
   variable.h
 */
 
-#ifndef _VARIABLE_H
-#define _VARIABLE_H
+#ifndef ngspice_VARIABLE_H
+#define ngspice_VARIABLE_H
 
 #include "ngspice/cpextern.h"
 
diff --git a/src/include/ngspice/bool.h b/src/include/ngspice/bool.h
index ad09130e8..6bdc0df8e 100644
--- a/src/include/ngspice/bool.h
+++ b/src/include/ngspice/bool.h
@@ -1,5 +1,5 @@
-#ifndef _BOOL_H
-#define _BOOL_H
+#ifndef ngspice_BOOL_H
+#define ngspice_BOOL_H
 
 //typedef unsigned char bool;
 typedef int bool;
diff --git a/src/include/ngspice/ciderinp.h b/src/include/ngspice/ciderinp.h
index 4abbe6716..ac6d88c59 100644
--- a/src/include/ngspice/ciderinp.h
+++ b/src/include/ngspice/ciderinp.h
@@ -4,8 +4,8 @@
  * CIDER input library header
  */
  
-#ifndef _CIDERINP_H
-#define _CIDERINP_H
+#ifndef ngspice_CIDERINP_H
+#define ngspice_CIDERINP_H
 
 
 /* externals for bdryset.c */
diff --git a/src/include/ngspice/cidersupt.h b/src/include/ngspice/cidersupt.h
index 7cf5212fc..2101f3549 100644
--- a/src/include/ngspice/cidersupt.h
+++ b/src/include/ngspice/cidersupt.h
@@ -4,8 +4,8 @@
  * CIDER support library header
  */
  
-#ifndef _CIDERSUPT_H
-#define _CIDERSUPT_H
+#ifndef ngspice_CIDERSUPT_H
+#define ngspice_CIDERSUPT_H
 
 #include "ngspice/numglobs.h"
 #include "ngspice/material.h"
diff --git a/src/include/ngspice/cluster.h b/src/include/ngspice/cluster.h
index 8a3c719b0..141a54aba 100644
--- a/src/include/ngspice/cluster.h
+++ b/src/include/ngspice/cluster.h
@@ -1,5 +1,5 @@
-#ifndef _CLUSTER_H_
-#define _CLUSTER_H_
+#ifndef ngspice_CLUSTER_H_
+#define ngspice_CLUSTER_H_
 #include "ngspice/cktdefs.h"
 
 /* Cluster definitions */
diff --git a/src/include/ngspice/compatmode.h b/src/include/ngspice/compatmode.h
index 8a1ff41e7..724ddcb69 100644
--- a/src/include/ngspice/compatmode.h
+++ b/src/include/ngspice/compatmode.h
@@ -1,5 +1,5 @@
-#ifndef _COMPATMODE_H
-#define _COMPATMODE_H
+#ifndef ngspice_COMPATMODE_H
+#define ngspice_COMPATMODE_H
 
 #include "ngspice/config.h"
 
diff --git a/src/include/ngspice/complex.h b/src/include/ngspice/complex.h
index 2d5864bed..750ecccd9 100644
--- a/src/include/ngspice/complex.h
+++ b/src/include/ngspice/complex.h
@@ -2,8 +2,8 @@
  * Copyright (c) 1985 Thomas L. Quarles
  * Modified: 1999 Paolo Nenzi, 2000 Arno W. Peters
  */
-#ifndef _COMPLEX_H
-#define _COMPLEX_H
+#ifndef ngspice_COMPLEX_H
+#define ngspice_COMPLEX_H
 
 
 /* Complex numbers. */
@@ -284,7 +284,7 @@ typedef struct {
 	(A).imag = (B.imag) - (C.imag);					      \
     }
 
-#ifndef _SPDEFS_H
+#ifndef ngspice_SPDEFS_H
 
 /* Macro function that returns the approx absolute value of a complex
    number. */
@@ -544,6 +544,6 @@ typedef struct {
     }                                                                   \
 }
 
-#endif /* _SPDEF_H */
+#endif /* ngspice_SPDEF_H */
 
 #endif
diff --git a/src/include/ngspice/cpstd.h b/src/include/ngspice/cpstd.h
index a8e11030e..e6f6ef560 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 _CPSTD_H_
-#define _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 0de36d221..416effc0c 100644
--- a/src/include/ngspice/defines.h
+++ b/src/include/ngspice/defines.h
@@ -10,8 +10,8 @@
  */
 
 
-#ifndef _DEFINES_H_
-#define _DEFINES_H_
+#ifndef ngspice_DEFINES_H_
+#define ngspice_DEFINES_H_
 
 
 #ifndef	M_PI
diff --git a/src/include/ngspice/dllitf.h b/src/include/ngspice/dllitf.h
index e999c5ed6..bb8d77701 100644
--- a/src/include/ngspice/dllitf.h
+++ b/src/include/ngspice/dllitf.h
@@ -3,8 +3,8 @@
    (c)2000 Arpad Buermen
 */
 
-#ifndef __DLLITF_H
-#define __DLLITF_H
+#ifndef ngspice__DLLITF_H
+#define ngspice__DLLITF_H
 
 #include "ngspice/mifproto.h"
 #include "ngspice/cmproto.h"
diff --git a/src/include/ngspice/dvec.h b/src/include/ngspice/dvec.h
index 02c971a6c..3f987f73c 100644
--- a/src/include/ngspice/dvec.h
+++ b/src/include/ngspice/dvec.h
@@ -1,5 +1,5 @@
-#ifndef _DVEC_H
-#define _DVEC_H
+#ifndef ngspice_DVEC_H
+#define ngspice_DVEC_H
 
 #include "ngspice/complex.h"
 #include "ngspice/grid.h"
diff --git a/src/include/ngspice/fteinput.h b/src/include/ngspice/fteinput.h
index d008702b7..84ddb7a2a 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 _FTEINPUT_H_
-#define _FTEINPUT_H_
+#ifndef ngspice_FTEINPUT_H_
+#define ngspice_FTEINPUT_H_
 
 
 #include <stdio.h>
diff --git a/src/include/ngspice/graph.h b/src/include/ngspice/graph.h
index 7200ac58f..a4e0059a7 100644
--- a/src/include/ngspice/graph.h
+++ b/src/include/ngspice/graph.h
@@ -7,8 +7,8 @@ Author: 1988 Jeffrey M. Hsu
     This file contains the graph structure.
 */
 
-#ifndef _GRAPH_H
-#define _GRAPH_H
+#ifndef ngspice_GRAPH_H
+#define ngspice_GRAPH_H
 
 #include "ngspice/typedefs.h"
 #include "ngspice/grid.h"
diff --git a/src/include/ngspice/grid.h b/src/include/ngspice/grid.h
index fd5744ec7..ffe44ffe4 100644
--- a/src/include/ngspice/grid.h
+++ b/src/include/ngspice/grid.h
@@ -1,5 +1,5 @@
-#ifndef _GRID_H
-#define _GRID_H
+#ifndef ngspice_GRID_H
+#define ngspice_GRID_H
 
 #include "typedefs.h"
 
diff --git a/src/include/ngspice/macros.h b/src/include/ngspice/macros.h
index 645782ad5..4d001b538 100644
--- a/src/include/ngspice/macros.h
+++ b/src/include/ngspice/macros.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef _MACROS_H_
-#define _MACROS_H_
+#ifndef ngspice_MACROS_H_
+#define ngspice_MACROS_H_
 
 /*
  *  #define-s that are always on
diff --git a/src/include/ngspice/memory.h b/src/include/ngspice/memory.h
index 0516aa2f7..e38922bd5 100644
--- a/src/include/ngspice/memory.h
+++ b/src/include/ngspice/memory.h
@@ -1,5 +1,5 @@
-#ifndef _MEMORY_H
-#define _MEMORY_H
+#ifndef ngspice_MEMORY_H
+#define ngspice_MEMORY_H
 
 #include <stddef.h>
 
diff --git a/src/include/ngspice/plot.h b/src/include/ngspice/plot.h
index 5347a3a98..392f6dcf4 100644
--- a/src/include/ngspice/plot.h
+++ b/src/include/ngspice/plot.h
@@ -1,5 +1,5 @@
-#ifndef _PLOT_H
-#define _PLOT_H
+#ifndef ngspice_PLOT_H
+#define ngspice_PLOT_H
 
 #include "ngspice/wordlist.h"
 #include "ngspice/bool.h"
diff --git a/src/include/ngspice/pnode.h b/src/include/ngspice/pnode.h
index c4fd89bcc..b1ade9b30 100644
--- a/src/include/ngspice/pnode.h
+++ b/src/include/ngspice/pnode.h
@@ -1,5 +1,5 @@
-#ifndef _PNODE_H
-#define _PNODE_H
+#ifndef ngspice_PNODE_H
+#define ngspice_PNODE_H
 
 struct pnode {
     char *pn_name;		/* If non-NULL, the name. */
diff --git a/src/include/ngspice/sim.h b/src/include/ngspice/sim.h
index 76e4f54bb..38a3ba3c6 100644
--- a/src/include/ngspice/sim.h
+++ b/src/include/ngspice/sim.h
@@ -1,5 +1,5 @@
-#ifndef _SIM_H
-#define _SIM_H
+#ifndef ngspice_SIM_H
+#define ngspice_SIM_H
 
 enum simulation_types {
   SV_NOTYPE,
diff --git a/src/include/ngspice/sperror.h b/src/include/ngspice/sperror.h
index d21249102..7ac45d516 100644
--- a/src/include/ngspice/sperror.h
+++ b/src/include/ngspice/sperror.h
@@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef _SPERROR_H
-#define _SPERROR_H
+#ifndef ngspice_SPERROR_H
+#define ngspice_SPERROR_H
 
 #include "ngspice/iferrmsg.h"
 
diff --git a/src/include/ngspice/swec.h b/src/include/ngspice/swec.h
index 6714ab140..731157267 100644
--- a/src/include/ngspice/swec.h
+++ b/src/include/ngspice/swec.h
@@ -10,8 +10,8 @@
  *  Copyright (C) University of California, Berkeley
  *
  */
-#ifndef _SWEC_H_
-#define _SWEC_H_
+#ifndef ngspice_SWEC_H_
+#define ngspice_SWEC_H_
 
 /************************************************************
  *
diff --git a/src/include/ngspice/wordlist.h b/src/include/ngspice/wordlist.h
index c1c22b720..6fa8f6633 100644
--- a/src/include/ngspice/wordlist.h
+++ b/src/include/ngspice/wordlist.h
@@ -1,5 +1,5 @@
-#ifndef _WORDLIST_H
-#define _WORDLIST_H
+#ifndef ngspice_WORDLIST_H
+#define ngspice_WORDLIST_H
 
 
 /* Doubly linked lists of words. */
diff --git a/src/maths/cmaths/cmath.h b/src/maths/cmaths/cmath.h
index 4bdbcca1f..96189f077 100644
--- a/src/maths/cmaths/cmath.h
+++ b/src/maths/cmaths/cmath.h
@@ -1,5 +1,5 @@
-#ifndef _CMATH_H
-#define _CMATH_H
+#ifndef ngspice_CMATH_H
+#define ngspice_CMATH_H
 
 #define alloc_c(len)    (TMALLOC(ngcomplex_t, len))
 #define alloc_d(len)    (TMALLOC(double, len))
diff --git a/src/maths/poly/interpolate.h b/src/maths/poly/interpolate.h
index 34e223cae..12c2ed34e 100644
--- a/src/maths/poly/interpolate.h
+++ b/src/maths/poly/interpolate.h
@@ -1,5 +1,5 @@
-#ifndef _INTERPOLATE_H
-#define _INTERPOLATE_H
+#ifndef ngspice_INTERPOLATE_H
+#define ngspice_INTERPOLATE_H
 
 #include "ngspice/bool.h"
 
diff --git a/src/maths/poly/poly.h b/src/maths/poly/poly.h
index 54235a1fa..cffe9e6bc 100644
--- a/src/maths/poly/poly.h
+++ b/src/maths/poly/poly.h
@@ -1,7 +1,7 @@
 /* The public interface to the polygon library. */
 
-#ifndef _POLY_H
-#define _POLY_H
+#ifndef ngspice_POLY_H
+#define ngspice_POLY_H
 
 #include "interpolate.h"
 #include "polyderiv.h"
diff --git a/src/maths/poly/polyderiv.h b/src/maths/poly/polyderiv.h
index a0a275edf..f1c88534e 100644
--- a/src/maths/poly/polyderiv.h
+++ b/src/maths/poly/polyderiv.h
@@ -1,5 +1,5 @@
-#ifndef _POLYDERIV_H
-#define _POLYDERIV_H
+#ifndef ngspice_POLYDERIV_H
+#define ngspice_POLYDERIV_H
 
 void ft_polyderiv(double *coeffs, int degree);
 
diff --git a/src/maths/poly/polyeval.h b/src/maths/poly/polyeval.h
index 1ed9c8074..92fe61493 100644
--- a/src/maths/poly/polyeval.h
+++ b/src/maths/poly/polyeval.h
@@ -1,5 +1,5 @@
-#ifndef _POLYEVAL_H
-#define _POLYEVAL_H
+#ifndef ngspice_POLYEVAL_H
+#define ngspice_POLYEVAL_H
 
 double ft_peval(double x, double *coeffs, int degree);
 
diff --git a/src/maths/poly/polyfit.h b/src/maths/poly/polyfit.h
index b3e4b5012..9f03097c7 100644
--- a/src/maths/poly/polyfit.h
+++ b/src/maths/poly/polyfit.h
@@ -1,5 +1,5 @@
-#ifndef _POLYFIT_H
-#define _POLYFIT_H
+#ifndef ngspice_POLYFIT_H
+#define ngspice_POLYFIT_H
 
 #include "ngspice/bool.h"
 
diff --git a/src/maths/sparse/spdefs.h b/src/maths/sparse/spdefs.h
index 240f5594b..5a76a191c 100644
--- a/src/maths/sparse/spdefs.h
+++ b/src/maths/sparse/spdefs.h
@@ -1,5 +1,5 @@
-#ifndef _SPDEFS_H
-#define _SPDEFS_H
+#ifndef ngspice_SPDEFS_H
+#define ngspice_SPDEFS_H
 /*
  *  DATA STRUCTURE AND MACRO DEFINITIONS for Sparse.
  *
diff --git a/src/spicelib/analysis/analysis.h b/src/spicelib/analysis/analysis.h
index 03a99de8c..78c1b91e9 100644
--- a/src/spicelib/analysis/analysis.h
+++ b/src/spicelib/analysis/analysis.h
@@ -1,5 +1,5 @@
-#ifndef _ANALYSIS_H
-#define _ANALYSIS_H
+#ifndef ngspice_ANALYSIS_H
+#define ngspice_ANALYSIS_H
 
 struct SPICEanalysis {
     IFanalysis if_analysis;
diff --git a/src/spicelib/parser/inppas1.h b/src/spicelib/parser/inppas1.h
index a5941038f..342e49f03 100644
--- a/src/spicelib/parser/inppas1.h
+++ b/src/spicelib/parser/inppas1.h
@@ -1,5 +1,5 @@
-#ifndef _INPPAS1_H
-#define _INPPAS1_H
+#ifndef ngspice_INPPAS1_H
+#define ngspice_INPPAS1_H
 
 #include "ngspice/inpdefs.h"
 
diff --git a/src/spicelib/parser/inppas2.h b/src/spicelib/parser/inppas2.h
index 7f0478fd7..b8dc7ed77 100644
--- a/src/spicelib/parser/inppas2.h
+++ b/src/spicelib/parser/inppas2.h
@@ -1,5 +1,5 @@
-#ifndef _INPPAS2_H
-#define _INPPAS2_H
+#ifndef ngspice_INPPAS2_H
+#define ngspice_INPPAS2_H
 
 #include "ngspice/inpdefs.h"
 
diff --git a/src/spicelib/parser/inppas3.h b/src/spicelib/parser/inppas3.h
index 9007855ac..6b0999acf 100644
--- a/src/spicelib/parser/inppas3.h
+++ b/src/spicelib/parser/inppas3.h
@@ -1,6 +1,6 @@
 /* AlansFixes */
-#ifndef _INPPAS3_H
-#define _INPPAS3_H
+#ifndef ngspice_INPPAS3_H
+#define ngspice_INPPAS3_H
 
 #include "ngspice/inpdefs.h"