From 7ea52cb9088eeb1c4a66fffc20a23f7c58f4802a Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 23 Jan 2013 20:57:12 +0100
Subject: [PATCH] prepare for #ifndef include wrapper unification

---
 src/frontend/com_chdir.h           | 2 +-
 src/frontend/com_echo.h            | 2 +-
 src/frontend/com_rehash.h          | 2 +-
 src/frontend/com_shell.h           | 2 +-
 src/frontend/com_shift.h           | 2 +-
 src/frontend/com_unset.h           | 2 +-
 src/frontend/control.h             | 2 +-
 src/frontend/display.h             | 2 +-
 src/frontend/gens.h                | 2 +-
 src/frontend/spiceif.h             | 2 +-
 src/frontend/streams.h             | 2 +-
 src/frontend/wdisp/windisp.h       | 2 +-
 src/frontend/wdisp/winprint.h      | 2 +-
 src/include/ngspice/acdefs.h       | 2 +-
 src/include/ngspice/bdrydefs.h     | 2 +-
 src/include/ngspice/carddefs.h     | 2 +-
 src/include/ngspice/cm.h           | 2 +-
 src/include/ngspice/cmconstants.h  | 2 +-
 src/include/ngspice/cmproto.h      | 2 +-
 src/include/ngspice/cmtypes.h      | 2 +-
 src/include/ngspice/contdefs.h     | 2 +-
 src/include/ngspice/cpdefs.h       | 2 +-
 src/include/ngspice/devdefs.h      | 2 +-
 src/include/ngspice/dgen.h         | 2 +-
 src/include/ngspice/distodef.h     | 2 +-
 src/include/ngspice/domndefs.h     | 2 +-
 src/include/ngspice/dopdefs.h      | 2 +-
 src/include/ngspice/dstring.h      | 2 +-
 src/include/ngspice/elctdefs.h     | 2 +-
 src/include/ngspice/enh.h          | 2 +-
 src/include/ngspice/evt.h          | 2 +-
 src/include/ngspice/evtproto.h     | 2 +-
 src/include/ngspice/evtudn.h       | 2 +-
 src/include/ngspice/ftedebug.h     | 2 +-
 src/include/ngspice/ftedefs.h      | 2 +-
 src/include/ngspice/fteext.h       | 2 +-
 src/include/ngspice/fteinp.h       | 2 +-
 src/include/ngspice/fteoptdefs.h   | 2 +-
 src/include/ngspice/fteparse.h     | 2 +-
 src/include/ngspice/gendefs.h      | 2 +-
 src/include/ngspice/gendev.h       | 2 +-
 src/include/ngspice/hash.h         | 2 +-
 src/include/ngspice/iferrmsg.h     | 2 +-
 src/include/ngspice/ifsim.h        | 2 +-
 src/include/ngspice/inpdefs.h      | 2 +-
 src/include/ngspice/ipc.h          | 2 +-
 src/include/ngspice/ipctiein.h     | 2 +-
 src/include/ngspice/jobdefs.h      | 2 +-
 src/include/ngspice/material.h     | 2 +-
 src/include/ngspice/matldefs.h     | 2 +-
 src/include/ngspice/meshdefs.h     | 2 +-
 src/include/ngspice/meshext.h      | 2 +-
 src/include/ngspice/methdefs.h     | 2 +-
 src/include/ngspice/mif.h          | 2 +-
 src/include/ngspice/mifcmdat.h     | 2 +-
 src/include/ngspice/mifdefs.h      | 2 +-
 src/include/ngspice/mifparse.h     | 2 +-
 src/include/ngspice/mifproto.h     | 2 +-
 src/include/ngspice/miftypes.h     | 2 +-
 src/include/ngspice/missing_math.h | 2 +-
 src/include/ngspice/mobdefs.h      | 2 +-
 src/include/ngspice/modldefs.h     | 2 +-
 src/include/ngspice/ngspice.h      | 4 ++--
 src/include/ngspice/noisedef.h     | 2 +-
 src/include/ngspice/numcards.h     | 2 +-
 src/include/ngspice/numconst.h     | 2 +-
 src/include/ngspice/numenum.h      | 2 +-
 src/include/ngspice/numgen.h       | 2 +-
 src/include/ngspice/numglobs.h     | 2 +-
 src/include/ngspice/onedev.h       | 2 +-
 src/include/ngspice/onemesh.h      | 2 +-
 src/include/ngspice/opdefs.h       | 2 +-
 src/include/ngspice/optdefs.h      | 2 +-
 src/include/ngspice/optndefs.h     | 2 +-
 src/include/ngspice/outpdefs.h     | 2 +-
 src/include/ngspice/profile.h      | 2 +-
 src/include/ngspice/sen2defs.h     | 2 +-
 src/include/ngspice/smpdefs.h      | 2 +-
 src/include/ngspice/tfdefs.h       | 2 +-
 src/include/ngspice/trandefs.h     | 2 +-
 src/include/ngspice/trcvdefs.h     | 2 +-
 src/include/ngspice/tskdefs.h      | 2 +-
 src/include/ngspice/twodev.h       | 2 +-
 src/include/ngspice/twomesh.h      | 2 +-
 src/include/ngspice/wstdio.h       | 2 +-
 src/maths/misc/accuracy.h          | 2 +-
 src/maths/misc/bernoull.h          | 2 +-
 src/maths/misc/norm.h              | 2 +-
 src/maths/sparse/spconfig.h        | 2 +-
 89 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/src/frontend/com_chdir.h b/src/frontend/com_chdir.h
index 19befe5f4..7eef35896 100644
--- a/src/frontend/com_chdir.h
+++ b/src/frontend/com_chdir.h
@@ -9,4 +9,4 @@
 
 void com_chdir(wordlist *wl);
 
-#endif /* COM_CHDIR_H */
+#endif
diff --git a/src/frontend/com_echo.h b/src/frontend/com_echo.h
index 260f7bab1..e73ea748a 100644
--- a/src/frontend/com_echo.h
+++ b/src/frontend/com_echo.h
@@ -9,4 +9,4 @@
 
 void com_echo(wordlist *wlist);
 
-#endif /* COM_ECHO_H */
+#endif
diff --git a/src/frontend/com_rehash.h b/src/frontend/com_rehash.h
index 861207aa2..d28bb3c08 100644
--- a/src/frontend/com_rehash.h
+++ b/src/frontend/com_rehash.h
@@ -9,4 +9,4 @@
 
 void com_rehash(wordlist *wl);
 
-#endif /* COM_REHASH_H */
+#endif
diff --git a/src/frontend/com_shell.h b/src/frontend/com_shell.h
index b165554d7..e3d3a2c8d 100644
--- a/src/frontend/com_shell.h
+++ b/src/frontend/com_shell.h
@@ -7,4 +7,4 @@
 
 void com_shell(wordlist *wl);
 
-#endif /* COM_SHELL_H */
+#endif
diff --git a/src/frontend/com_shift.h b/src/frontend/com_shift.h
index 7f246534b..330937613 100644
--- a/src/frontend/com_shift.h
+++ b/src/frontend/com_shift.h
@@ -7,4 +7,4 @@
 
 void com_shift(wordlist *wl);
 
-#endif /* COM_SHIFT_H */
+#endif
diff --git a/src/frontend/com_unset.h b/src/frontend/com_unset.h
index 5955fcbcd..877a0bc65 100644
--- a/src/frontend/com_unset.h
+++ b/src/frontend/com_unset.h
@@ -9,4 +9,4 @@
 
 void com_unset(wordlist *wl);
 
-#endif /* COM_UNSET_H */
+#endif
diff --git a/src/frontend/control.h b/src/frontend/control.h
index cdd6eaf20..6e3267378 100644
--- a/src/frontend/control.h
+++ b/src/frontend/control.h
@@ -48,4 +48,4 @@ extern struct control *control[CONTROLSTACKSIZE];
 extern struct control *cend[CONTROLSTACKSIZE];
 extern int stackp;
 
-#endif /* CONTROL_H */
+#endif
diff --git a/src/frontend/display.h b/src/frontend/display.h
index 1b7a7b9df..1add60aaf 100644
--- a/src/frontend/display.h
+++ b/src/frontend/display.h
@@ -31,5 +31,5 @@ void SaveText(GRAPH *graph, char *text, int x, int y);
 int DevSwitch(char *devname);
 
 
-#endif /* DISPLAY_H_INCLUDED */
+#endif
 
diff --git a/src/frontend/gens.h b/src/frontend/gens.h
index 403db4201..671ce4ffa 100644
--- a/src/frontend/gens.h
+++ b/src/frontend/gens.h
@@ -13,4 +13,4 @@ int dgen_for_n(dgen *dg, int n, int (*fn) (dgen*, IFparm*, int), IFparm *data, i
 void dgen_nth_next(dgen **dg, int n);
 
 
-#endif /* GENS_H_INCLUDED */
+#endif
diff --git a/src/frontend/spiceif.h b/src/frontend/spiceif.h
index 01c4e6ef3..ff7c47e61 100644
--- a/src/frontend/spiceif.h
+++ b/src/frontend/spiceif.h
@@ -16,4 +16,4 @@ int  if_analQbyName(CKTcircuit *ckt, int which, JOB *anal, char *name, IFvalue *
 void com_snload(wordlist *wl);
 void com_snsave(wordlist *wl);
 
-#endif /* SPICEIF_H_INCLUDED */
+#endif
diff --git a/src/frontend/streams.h b/src/frontend/streams.h
index ffdc55de4..416f942f8 100644
--- a/src/frontend/streams.h
+++ b/src/frontend/streams.h
@@ -10,4 +10,4 @@
 
 void fixdescriptors(void);
 
-#endif /* STREAMS_H */
+#endif
diff --git a/src/frontend/wdisp/windisp.h b/src/frontend/wdisp/windisp.h
index 8931722b5..c72fb8cad 100644
--- a/src/frontend/wdisp/windisp.h
+++ b/src/frontend/wdisp/windisp.h
@@ -33,4 +33,4 @@ disp_fn_SetColor_t         WPRINT_SetColor;
 disp_fn_Update_t           WPRINT_Update;
 //extern int WIN_DiagramReady();
 
-#endif /* WINDISP_H */
+#endif
diff --git a/src/frontend/wdisp/winprint.h b/src/frontend/wdisp/winprint.h
index f2e54b6db..90d92b395 100644
--- a/src/frontend/wdisp/winprint.h
+++ b/src/frontend/wdisp/winprint.h
@@ -21,4 +21,4 @@ int WPRINT_SetColor( int color);
 int WPRINT_Update(void);
 int WPRINT_DiagramReady(void);
 
-#endif /* WINPRINT_H */
+#endif
diff --git a/src/include/ngspice/acdefs.h b/src/include/ngspice/acdefs.h
index 3807a2681..66699d031 100644
--- a/src/include/ngspice/acdefs.h
+++ b/src/include/ngspice/acdefs.h
@@ -36,4 +36,4 @@ typedef struct {
 #define AC_STOP 5
 #define AC_STEPS 6
 
-#endif /*ACDEFS*/
+#endif
diff --git a/src/include/ngspice/bdrydefs.h b/src/include/ngspice/bdrydefs.h
index 73fb8cb8b..e04cc31ea 100644
--- a/src/include/ngspice/bdrydefs.h
+++ b/src/include/ngspice/bdrydefs.h
@@ -61,4 +61,4 @@ typedef struct sBDRYcard {
 #define BDRY_SP		13
 #define BDRY_LAYER	14
 
-#endif /* BDRY_H */
+#endif
diff --git a/src/include/ngspice/carddefs.h b/src/include/ngspice/carddefs.h
index 605361f71..a77a6fb48 100644
--- a/src/include/ngspice/carddefs.h
+++ b/src/include/ngspice/carddefs.h
@@ -24,4 +24,4 @@ Authors :  1991 David Gates
 #include "ngspice/optndefs.h"
 #include "ngspice/outpdefs.h"
 
-#endif /* CARDDEFS_H */
+#endif
diff --git a/src/include/ngspice/cm.h b/src/include/ngspice/cm.h
index 8659add84..e3fb9ea7b 100644
--- a/src/include/ngspice/cm.h
+++ b/src/include/ngspice/cm.h
@@ -46,4 +46,4 @@ NON-STANDARD FEATURES
 #include "ngspice/mifcmdat.h"
 
 
-#endif /* CM_DEFINED */
+#endif
diff --git a/src/include/ngspice/cmconstants.h b/src/include/ngspice/cmconstants.h
index ebac0605c..6dc7d96af 100644
--- a/src/include/ngspice/cmconstants.h
+++ b/src/include/ngspice/cmconstants.h
@@ -54,4 +54,4 @@ NON-STANDARD FEATURES
 #define EVENT        MIF_EVENT_DRIVEN
 
 
-#endif /* CMCONSTANTS_DEFINED */
+#endif
diff --git a/src/include/ngspice/cmproto.h b/src/include/ngspice/cmproto.h
index 6d9db0edb..d5b281e3a 100644
--- a/src/include/ngspice/cmproto.h
+++ b/src/include/ngspice/cmproto.h
@@ -104,4 +104,4 @@ void  free_pj(void *ptr);
 
 FILE *fopen_with_path(const char *path, const char *mode);
 
-#endif /* CMPROTO_DEFINED */
+#endif
diff --git a/src/include/ngspice/cmtypes.h b/src/include/ngspice/cmtypes.h
index 536bf6909..bd7b30d3f 100644
--- a/src/include/ngspice/cmtypes.h
+++ b/src/include/ngspice/cmtypes.h
@@ -68,4 +68,4 @@ typedef struct {
 
 
 
-#endif /* CMTYPES_DEFINED */
+#endif
diff --git a/src/include/ngspice/contdefs.h b/src/include/ngspice/contdefs.h
index da6e3b686..3efe6c28d 100644
--- a/src/include/ngspice/contdefs.h
+++ b/src/include/ngspice/contdefs.h
@@ -30,4 +30,4 @@ typedef struct sCONTcard {
 #define CONT_WORKFUN	5
 #define CONT_NUMBER	6
 
-#endif /* CONT_H */
+#endif
diff --git a/src/include/ngspice/cpdefs.h b/src/include/ngspice/cpdefs.h
index 42155b3f8..fc76dde2a 100644
--- a/src/include/ngspice/cpdefs.h
+++ b/src/include/ngspice/cpdefs.h
@@ -96,4 +96,4 @@ struct alias {
 
 #include "ngspice/cpextern.h"
 
-#endif /*CPDEFS*/
+#endif
diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h
index fb5ba6771..448260862 100644
--- a/src/include/ngspice/devdefs.h
+++ b/src/include/ngspice/devdefs.h
@@ -159,4 +159,4 @@ extern int        DEVmaxnum;    /* size of DEVices array */
 
 #define DEV_DEFAULT	0x1
 
-#endif /*DEV*/
+#endif
diff --git a/src/include/ngspice/dgen.h b/src/include/ngspice/dgen.h
index e0dd4c9ed..92fa1740c 100644
--- a/src/include/ngspice/dgen.h
+++ b/src/include/ngspice/dgen.h
@@ -28,4 +28,4 @@ struct st_dgen {
 
 extern dgen	*dgen_init(GENcircuit *ckt, wordlist *wl, int nomix, int flag, int model);
 
-#endif /* DGEN_H */
+#endif
diff --git a/src/include/ngspice/distodef.h b/src/include/ngspice/distodef.h
index bed82aacc..6ab0565a0 100644
--- a/src/include/ngspice/distodef.h
+++ b/src/include/ngspice/distodef.h
@@ -218,4 +218,4 @@ extern int CKTdisto(CKTcircuit *ckt, int mode);
 extern int DkerProc(int type, double *rPtr, double *iPtr, int size, DISTOAN *job);
 
 
-#endif /*DISTODEFS*/
+#endif
diff --git a/src/include/ngspice/domndefs.h b/src/include/ngspice/domndefs.h
index e8d0540fe..c99a20287 100644
--- a/src/include/ngspice/domndefs.h
+++ b/src/include/ngspice/domndefs.h
@@ -49,4 +49,4 @@ typedef struct sDOMNcard {
 #define DOMN_MATERIAL	10
 
 
-#endif /* DOMN_H */
+#endif
diff --git a/src/include/ngspice/dopdefs.h b/src/include/ngspice/dopdefs.h
index 559c3acde..af46ea59f 100644
--- a/src/include/ngspice/dopdefs.h
+++ b/src/include/ngspice/dopdefs.h
@@ -81,4 +81,4 @@ typedef struct sDOPcard {
 #define DOP_EXP_LAT	31
 #define DOP_DOMAIN	32
 
-#endif /* DOP_H */
+#endif
diff --git a/src/include/ngspice/dstring.h b/src/include/ngspice/dstring.h
index 872c176f1..7ebcc09f5 100644
--- a/src/include/ngspice/dstring.h
+++ b/src/include/ngspice/dstring.h
@@ -37,4 +37,4 @@ extern void spice_dstring_free(SPICE_DSTRINGPTR dsPtr) ;
 #define spice_dstring_space(x_xz) ((x_xz)->spaceAvl)
 #define spice_dstring_length(x_xz) ((x_xz)->length)
 
-#endif /* DSTRING_H */
+#endif
diff --git a/src/include/ngspice/elctdefs.h b/src/include/ngspice/elctdefs.h
index 534670f2d..ef5aa53d4 100644
--- a/src/include/ngspice/elctdefs.h
+++ b/src/include/ngspice/elctdefs.h
@@ -45,4 +45,4 @@ typedef struct sELCTcard {
 #define ELCT_IY_HIGH	8
 #define ELCT_NUMBER	9
 
-#endif /* ELCT_H */
+#endif
diff --git a/src/include/ngspice/enh.h b/src/include/ngspice/enh.h
index c6abc279d..562c770f2 100644
--- a/src/include/ngspice/enh.h
+++ b/src/include/ngspice/enh.h
@@ -106,4 +106,4 @@ void ENHreport_conv_prob(Enh_Conv_Source_t type, char *name, char *msg);
 struct line *ENHtranslate_poly(struct line *deck);
 
 
-#endif /* ENH_HEADER */
+#endif
diff --git a/src/include/ngspice/evt.h b/src/include/ngspice/evt.h
index 08040a614..11038415b 100644
--- a/src/include/ngspice/evt.h
+++ b/src/include/ngspice/evt.h
@@ -368,4 +368,4 @@ typedef struct {
 
 
 
-#endif /* EVT_HEADER */
+#endif
diff --git a/src/include/ngspice/evtproto.h b/src/include/ngspice/evtproto.h
index 0b15a21db..498f10791 100644
--- a/src/include/ngspice/evtproto.h
+++ b/src/include/ngspice/evtproto.h
@@ -123,4 +123,4 @@ void EVTaccept(
 
 struct dvec *EVTfindvec(char *node);
 
-#endif /* EVTPROTO_HEADER */
+#endif
diff --git a/src/include/ngspice/evtudn.h b/src/include/ngspice/evtudn.h
index f440b79f0..fda6aa89d 100644
--- a/src/include/ngspice/evtudn.h
+++ b/src/include/ngspice/evtudn.h
@@ -120,4 +120,4 @@ extern int             g_evt_num_udn_types;
 extern Evt_Udn_Info_t  **g_evt_udn_info;
 
 
-#endif /* EVTUDN_HEADER */
+#endif
diff --git a/src/include/ngspice/ftedebug.h b/src/include/ngspice/ftedebug.h
index 0ca464b9d..c81bdd012 100644
--- a/src/include/ngspice/ftedebug.h
+++ b/src/include/ngspice/ftedebug.h
@@ -49,4 +49,4 @@ struct dbcomm {
     struct dbcomm *db_next; /* List of active debugging commands. */
 } ;
 
-#endif /* FTEDEBUG_H */
+#endif
diff --git a/src/include/ngspice/ftedefs.h b/src/include/ngspice/ftedefs.h
index e0c2cf489..affe0634a 100644
--- a/src/include/ngspice/ftedefs.h
+++ b/src/include/ngspice/ftedefs.h
@@ -60,4 +60,4 @@ struct circ {
 
 #include "ngspice/fteext.h"
 
-#endif /* FTEdefs_h */
+#endif
diff --git a/src/include/ngspice/fteext.h b/src/include/ngspice/fteext.h
index 9f93cc3ea..d7d0c1ebb 100644
--- a/src/include/ngspice/fteext.h
+++ b/src/include/ngspice/fteext.h
@@ -345,4 +345,4 @@ extern bool ft_setflag;
 /* error.c */
 extern void controlled_exit(int status);
 
-#endif /* FTEext_h */
+#endif
diff --git a/src/include/ngspice/fteinp.h b/src/include/ngspice/fteinp.h
index ee21abc51..89a89b531 100644
--- a/src/include/ngspice/fteinp.h
+++ b/src/include/ngspice/fteinp.h
@@ -29,5 +29,5 @@ struct line {
 #define LS_PHYSICAL 2
 #define LS_DECK  3
 
-#endif /* FTEinput_h */
+#endif
 
diff --git a/src/include/ngspice/fteoptdefs.h b/src/include/ngspice/fteoptdefs.h
index b4f83a0bf..c0f22cd6c 100644
--- a/src/include/ngspice/fteoptdefs.h
+++ b/src/include/ngspice/fteoptdefs.h
@@ -22,4 +22,4 @@ typedef struct sFTESTATistics {
 #define FTEOPT_NLT    2
 #define FTEOPT_NPT    3
 
-#endif /*FTEOPT*/
+#endif
diff --git a/src/include/ngspice/fteparse.h b/src/include/ngspice/fteparse.h
index 2cd1d45cc..7c1369d2d 100644
--- a/src/include/ngspice/fteparse.h
+++ b/src/include/ngspice/fteparse.h
@@ -103,4 +103,4 @@ struct element {
 #define PT_OP_TERNARY  23
 
 
-#endif /* FTEPARSE */
+#endif
diff --git a/src/include/ngspice/gendefs.h b/src/include/ngspice/gendefs.h
index 2ae3067fa..cd209d218 100644
--- a/src/include/ngspice/gendefs.h
+++ b/src/include/ngspice/gendefs.h
@@ -47,4 +47,4 @@ struct GENmodel {       /* model structure for a resistor */
     IFuid GENmodName;           /* pointer to character string naming this model */
 };
 
-#endif /*GEN*/
+#endif
diff --git a/src/include/ngspice/gendev.h b/src/include/ngspice/gendev.h
index 8b43f431a..5c74ff201 100644
--- a/src/include/ngspice/gendev.h
+++ b/src/include/ngspice/gendev.h
@@ -119,4 +119,4 @@ typedef struct sBoundaryInfo ONEboundary;
 typedef struct sBoundaryInfo TWOboundary;
 typedef struct sBoundaryInfo BDRYboundary;
 
-#endif /* GENDEV_H */
+#endif
diff --git a/src/include/ngspice/hash.h b/src/include/ngspice/hash.h
index 67fb6c0bd..679454ba0 100644
--- a/src/include/ngspice/hash.h
+++ b/src/include/ngspice/hash.h
@@ -502,4 +502,4 @@ Function:
 */
 
 
-#endif /* NGHASH_H */
+#endif
diff --git a/src/include/ngspice/iferrmsg.h b/src/include/ngspice/iferrmsg.h
index 0516b81ff..77fff356a 100644
--- a/src/include/ngspice/iferrmsg.h
+++ b/src/include/ngspice/iferrmsg.h
@@ -55,4 +55,4 @@ extern char *errRtn;    /* name of the routine declaring error */
                         /* and thus can be set correctly even if we run out */
                         /* of memory */
 
-#endif /*IFERRMSGS*/
+#endif
diff --git a/src/include/ngspice/ifsim.h b/src/include/ngspice/ifsim.h
index 0719b70e3..b7bf4fa18 100644
--- a/src/include/ngspice/ifsim.h
+++ b/src/include/ngspice/ifsim.h
@@ -486,4 +486,4 @@ struct IFfrontEnd {
 #define OUT_SCALE_LIN   1
 #define OUT_SCALE_LOG   2
 
-#endif /*IFSIMULATOR*/
+#endif
diff --git a/src/include/ngspice/inpdefs.h b/src/include/ngspice/inpdefs.h
index 265ad416b..1d1bd91a3 100644
--- a/src/include/ngspice/inpdefs.h
+++ b/src/include/ngspice/inpdefs.h
@@ -134,4 +134,4 @@ int INPremTerm(char *token, INPtables *tab);
 
 
 
-#endif /*INP*/
+#endif
diff --git a/src/include/ngspice/ipc.h b/src/include/ngspice/ipc.h
index a63f0b742..62650b37d 100644
--- a/src/include/ngspice/ipc.h
+++ b/src/include/ngspice/ipc.h
@@ -116,4 +116,4 @@ typedef enum {
 
 
 
-#endif  /* IPC_DEFINED */
+#endif
diff --git a/src/include/ngspice/ipctiein.h b/src/include/ngspice/ipctiein.h
index abffee051..70a0aeb47 100644
--- a/src/include/ngspice/ipctiein.h
+++ b/src/include/ngspice/ipctiein.h
@@ -92,5 +92,5 @@ typedef struct {
 extern  Ipc_Tiein_t  g_ipc;
 
 
-#endif  /* IPC_TIEIN_DEFINED */
+#endif
 
diff --git a/src/include/ngspice/jobdefs.h b/src/include/ngspice/jobdefs.h
index 32d55968d..aeaf8019c 100644
--- a/src/include/ngspice/jobdefs.h
+++ b/src/include/ngspice/jobdefs.h
@@ -21,4 +21,4 @@ struct JOB {
 #define FREQUENCYDOMAIN 2
 #define SWEEPDOMAIN	3
 
-#endif /*JOBdef*/
+#endif
diff --git a/src/include/ngspice/material.h b/src/include/ngspice/material.h
index d079da37e..2c0951848 100644
--- a/src/include/ngspice/material.h
+++ b/src/include/ngspice/material.h
@@ -79,4 +79,4 @@ typedef struct sMaterialInfo ONEmaterial;
 typedef struct sMaterialInfo TWOmaterial;
 typedef struct sMaterialInfo MATLmaterial;
 
-#endif /* MATERIAL_H */
+#endif
diff --git a/src/include/ngspice/matldefs.h b/src/include/ngspice/matldefs.h
index 0e56b617c..e62a1f5e4 100644
--- a/src/include/ngspice/matldefs.h
+++ b/src/include/ngspice/matldefs.h
@@ -90,4 +90,4 @@ typedef struct sMATLcard {
 #define MATL_DEGDC	28
 #define MATL_CREF_EG	29
 
-#endif /* MATL_H */
+#endif
diff --git a/src/include/ngspice/meshdefs.h b/src/include/ngspice/meshdefs.h
index 30e042d49..c4b7b296c 100644
--- a/src/include/ngspice/meshdefs.h
+++ b/src/include/ngspice/meshdefs.h
@@ -41,4 +41,4 @@ typedef struct sMESHcard {
 #define MESH_H_MAX	6
 #define MESH_RATIO	7
 
-#endif /* MESH_H */
+#endif
diff --git a/src/include/ngspice/meshext.h b/src/include/ngspice/meshext.h
index a5d679e91..72914125f 100644
--- a/src/include/ngspice/meshext.h
+++ b/src/include/ngspice/meshext.h
@@ -24,4 +24,4 @@ extern int MESHlocate( MESHcoord *, double );
 extern int MESHcheck( char, MESHcard * );
 extern int MESHsetup( char, MESHcard *, MESHcoord **, int * );
 
-#endif /* MESHEXT_H */
+#endif
diff --git a/src/include/ngspice/methdefs.h b/src/include/ngspice/methdefs.h
index 5fe82343e..a2757bd11 100644
--- a/src/include/ngspice/methdefs.h
+++ b/src/include/ngspice/methdefs.h
@@ -42,4 +42,4 @@ typedef struct sMETHcard {
 #define METH_ITLIM      7
 #define METH_VOLTPRED	8
 
-#endif /* METH_H */
+#endif
diff --git a/src/include/ngspice/mif.h b/src/include/ngspice/mif.h
index 3d30b795b..674920ce4 100644
--- a/src/include/ngspice/mif.h
+++ b/src/include/ngspice/mif.h
@@ -84,4 +84,4 @@ extern int MIFmSize;
 
 extern Mif_Info_t  g_mif_info;
 
-#endif  /* MIF */
+#endif
diff --git a/src/include/ngspice/mifcmdat.h b/src/include/ngspice/mifcmdat.h
index 174bc1773..a33900d9d 100644
--- a/src/include/ngspice/mifcmdat.h
+++ b/src/include/ngspice/mifcmdat.h
@@ -371,4 +371,4 @@ typedef struct Mif_Private_s {
 
 
 
-#endif /* MIFCMDAT */
+#endif
diff --git a/src/include/ngspice/mifdefs.h b/src/include/ngspice/mifdefs.h
index 5cf401a60..e2fa9bf70 100644
--- a/src/include/ngspice/mifdefs.h
+++ b/src/include/ngspice/mifdefs.h
@@ -108,4 +108,4 @@ typedef struct sMIFmodel {
 
 
 
-#endif /* MIFDEFS */
+#endif
diff --git a/src/include/ngspice/mifparse.h b/src/include/ngspice/mifparse.h
index 3bdb40eff..e8ef932c2 100644
--- a/src/include/ngspice/mifparse.h
+++ b/src/include/ngspice/mifparse.h
@@ -117,4 +117,4 @@ typedef struct Mif_Inst_Var_Info_s {
 } Mif_Inst_Var_Info_t;
 
 
-#endif /* MIFPARSE */
+#endif
diff --git a/src/include/ngspice/mifproto.h b/src/include/ngspice/mifproto.h
index 019709857..ebc953d67 100644
--- a/src/include/ngspice/mifproto.h
+++ b/src/include/ngspice/mifproto.h
@@ -159,4 +159,4 @@ extern Mif_Cntl_Src_Type_t MIFget_cntl_src_type(
 extern char *MIFcopy(char *);
 
 
-#endif  /* MIFPROTO */
+#endif
diff --git a/src/include/ngspice/miftypes.h b/src/include/ngspice/miftypes.h
index e425b4e22..7b5a2dcd0 100644
--- a/src/include/ngspice/miftypes.h
+++ b/src/include/ngspice/miftypes.h
@@ -224,4 +224,4 @@ typedef struct {
 } Mif_Parse_Value_t;
 
 
-#endif /* MIFTYPES */
+#endif
diff --git a/src/include/ngspice/missing_math.h b/src/include/ngspice/missing_math.h
index 0ab551e47..84d1aea0b 100644
--- a/src/include/ngspice/missing_math.h
+++ b/src/include/ngspice/missing_math.h
@@ -46,4 +46,4 @@ extern int isinf(double);
 #endif /* HAVE_ISINF */
 #endif /* HAVE_DECL_ISINF */
 
-#endif /* MISSING_MATH_H_INCLUDED */
+#endif
diff --git a/src/include/ngspice/mobdefs.h b/src/include/ngspice/mobdefs.h
index 03c0e06c3..4aa6ea2b9 100644
--- a/src/include/ngspice/mobdefs.h
+++ b/src/include/ngspice/mobdefs.h
@@ -65,4 +65,4 @@ typedef struct sMOBcard {
 #define MOB_MATERIAL	16
 #define MOB_INIT	17
 
-#endif /* MOB_H */
+#endif
diff --git a/src/include/ngspice/modldefs.h b/src/include/ngspice/modldefs.h
index 36892a38b..fb2363379 100644
--- a/src/include/ngspice/modldefs.h
+++ b/src/include/ngspice/modldefs.h
@@ -51,4 +51,4 @@ typedef struct sMODLcard {
 #define MODL_AUGER	10
 #define MODL_AVAL	11
 
-#endif /* MODL_H */
+#endif
diff --git a/src/include/ngspice/ngspice.h b/src/include/ngspice/ngspice.h
index 11d2e4c60..602baffb4 100644
--- a/src/include/ngspice/ngspice.h
+++ b/src/include/ngspice/ngspice.h
@@ -2,7 +2,7 @@
  * Main header file for ngspice
  * 1999 E. Rouat
  ************/
-#ifndef NGSPICE_H_INCLUDED /* va */
+#ifndef NGSPICE_H_INCLUDED
 #define NGSPICE_H_INCLUDED
 
 /* #include "memwatch.h"
@@ -254,4 +254,4 @@ extern int tcl_fprintf(FILE *f, const char *format, ...);
 #define NG_IGNOREABLE(x)  (void)x
 
 
-#endif /* NGSPICE_H_INCLUDED */
+#endif
diff --git a/src/include/ngspice/noisedef.h b/src/include/ngspice/noisedef.h
index 3a828c489..7957fb95e 100644
--- a/src/include/ngspice/noisedef.h
+++ b/src/include/ngspice/noisedef.h
@@ -126,4 +126,4 @@ void NevalSrc2 (double *, double *, CKTcircuit *, int, int, int, double, int, in
 void NevalSrcInstanceTemp (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param, double param2);
 double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
-#endif /*NOISEDEFS*/
+#endif
diff --git a/src/include/ngspice/numcards.h b/src/include/ngspice/numcards.h
index 4ce2103a5..3f956a0a4 100644
--- a/src/include/ngspice/numcards.h
+++ b/src/include/ngspice/numcards.h
@@ -47,4 +47,4 @@ typedef struct sIFcardInfo {
 	/* routine to find out about a card's details */
 } IFcardInfo;
 
-#endif /* NUMCARDS_H */
+#endif
diff --git a/src/include/ngspice/numconst.h b/src/include/ngspice/numconst.h
index 924b4d1d1..72ca7afc0 100644
--- a/src/include/ngspice/numconst.h
+++ b/src/include/ngspice/numconst.h
@@ -228,4 +228,4 @@ Authors: 1987 Karti Mayaram, 1991 David Gates
 #define DABSTOL1D   1.0e-12				/* --- */
 #define DABSTOL2D   1.0e-8				/* --- */
 
-#endif /* NUMCONST_H */
+#endif
diff --git a/src/include/ngspice/numenum.h b/src/include/ngspice/numenum.h
index 3160e9211..6a7344938 100644
--- a/src/include/ngspice/numenum.h
+++ b/src/include/ngspice/numenum.h
@@ -90,4 +90,4 @@ Authors: 1991 David Gates
 #define STAT_TRAN	2
 #define STAT_AC		3
 
-#endif /* NUMENUM_H */
+#endif
diff --git a/src/include/ngspice/numgen.h b/src/include/ngspice/numgen.h
index 5227c7989..0117cabfd 100644
--- a/src/include/ngspice/numgen.h
+++ b/src/include/ngspice/numgen.h
@@ -39,4 +39,4 @@ typedef struct sGENnumModel {	/* model structure for a numerical device */
     OUTPcard *GENoutputs;	/* list of output cards */
 } GENnumModel;
     
-#endif /* NUMGEN_H */
+#endif
diff --git a/src/include/ngspice/numglobs.h b/src/include/ngspice/numglobs.h
index a827974c6..9c4d4262f 100644
--- a/src/include/ngspice/numglobs.h
+++ b/src/include/ngspice/numglobs.h
@@ -56,4 +56,4 @@ typedef struct sGLOBvalues
   double ENorm;
 } GLOBvalues;
 
-#endif /* NUMGLOBS_H */
+#endif
diff --git a/src/include/ngspice/onedev.h b/src/include/ngspice/onedev.h
index 55ff12968..38e714d95 100644
--- a/src/include/ngspice/onedev.h
+++ b/src/include/ngspice/onedev.h
@@ -70,4 +70,4 @@ typedef struct sONEcontact
     double workf;                   /* metal work function */
 } ONEcontact;
 
-#endif /* ONEDEV_H */
+#endif
diff --git a/src/include/ngspice/onemesh.h b/src/include/ngspice/onemesh.h
index 442b77131..653dd180f 100644
--- a/src/include/ngspice/onemesh.h
+++ b/src/include/ngspice/onemesh.h
@@ -127,4 +127,4 @@ typedef struct sONEnode {
 #define ONEnumNodeStates 5
 #define ONEnumEdgeStates 2
 
-#endif /* ONEMESH */
+#endif
diff --git a/src/include/ngspice/opdefs.h b/src/include/ngspice/opdefs.h
index 3f87e8ff4..33d7bcbeb 100644
--- a/src/include/ngspice/opdefs.h
+++ b/src/include/ngspice/opdefs.h
@@ -21,4 +21,4 @@ typedef struct {
     char *JOBname;
 } OP;
 
-#endif /*DCOP*/
+#endif
diff --git a/src/include/ngspice/optdefs.h b/src/include/ngspice/optdefs.h
index a2b81aadd..0311ca897 100644
--- a/src/include/ngspice/optdefs.h
+++ b/src/include/ngspice/optdefs.h
@@ -136,4 +136,4 @@ typedef struct {
 
 #define OPT_TOTALDEV 200 /* Total devices in the netlist */
 
-#endif /*OPT*/
+#endif
diff --git a/src/include/ngspice/optndefs.h b/src/include/ngspice/optndefs.h
index bdb5c358d..11144285a 100644
--- a/src/include/ngspice/optndefs.h
+++ b/src/include/ngspice/optndefs.h
@@ -57,4 +57,4 @@ typedef struct sOPTNcard {
 #define OPTN_IC_FILE     18
 #define OPTN_UNIQUE      19
 
-#endif /* OPTN_H */
+#endif
diff --git a/src/include/ngspice/outpdefs.h b/src/include/ngspice/outpdefs.h
index 6d6becfd6..eba04bfd6 100644
--- a/src/include/ngspice/outpdefs.h
+++ b/src/include/ngspice/outpdefs.h
@@ -104,4 +104,4 @@ typedef struct sOUTPcard {
 #define OUTP_MUN	30
 #define OUTP_MUP	31
 
-#endif /* OUTP_H */
+#endif
diff --git a/src/include/ngspice/profile.h b/src/include/ngspice/profile.h
index b47bc0576..058f053df 100644
--- a/src/include/ngspice/profile.h
+++ b/src/include/ngspice/profile.h
@@ -51,4 +51,4 @@ typedef struct sDOPtable {
 #define IMP_N_TYPE	5
 #define IMP_P_TYPE	6
 
-#endif /* PROFILE_H */
+#endif
diff --git a/src/include/ngspice/sen2defs.h b/src/include/ngspice/sen2defs.h
index 1b02307ca..8247af9f9 100644
--- a/src/include/ngspice/sen2defs.h
+++ b/src/include/ngspice/sen2defs.h
@@ -67,4 +67,4 @@ struct SENstruct {
 #define SEN_DEV 4
 #define SEN_PARM 5
 
-#endif /* SENSTRUCTS */
+#endif
diff --git a/src/include/ngspice/smpdefs.h b/src/include/ngspice/smpdefs.h
index ec982e99a..24b32b4d1 100644
--- a/src/include/ngspice/smpdefs.h
+++ b/src/include/ngspice/smpdefs.h
@@ -40,4 +40,4 @@ int SMPcZeroCol(SMPmatrix *eMatrix, int Col);
 int SMPcAddCol(SMPmatrix *eMatrix, int Accum_Col, int Addend_Col);
 int SMPzeroRow(SMPmatrix *eMatrix, int Row);
 
-#endif /*SMP*/
+#endif
diff --git a/src/include/ngspice/tfdefs.h b/src/include/ngspice/tfdefs.h
index fcac1e403..45097d55a 100644
--- a/src/include/ngspice/tfdefs.h
+++ b/src/include/ngspice/tfdefs.h
@@ -37,4 +37,4 @@ struct TFan {
 #define TF_OUTNAME 5
 
 
-#endif  /*TF*/
+#endif
diff --git a/src/include/ngspice/trandefs.h b/src/include/ngspice/trandefs.h
index 34ed45059..b138519c6 100644
--- a/src/include/ngspice/trandefs.h
+++ b/src/include/ngspice/trandefs.h
@@ -32,4 +32,4 @@ typedef struct {
 #define TRAN_TSTEP 3
 #define TRAN_TMAX 4
 #define TRAN_UIC 5
-#endif /*TRAN*/
+#endif
diff --git a/src/include/ngspice/trcvdefs.h b/src/include/ngspice/trcvdefs.h
index fe203018d..30a04ac05 100644
--- a/src/include/ngspice/trcvdefs.h
+++ b/src/include/ngspice/trcvdefs.h
@@ -54,4 +54,4 @@ typedef struct {
 #define DCT_NAME2 9
 #define DCT_TYPE2 10
 
-#endif /*DCTR*/
+#endif
diff --git a/src/include/ngspice/tskdefs.h b/src/include/ngspice/tskdefs.h
index fb4953c6e..d4792cb0c 100644
--- a/src/include/ngspice/tskdefs.h
+++ b/src/include/ngspice/tskdefs.h
@@ -68,4 +68,4 @@ struct TSKtask {
     unsigned int TSKnoopac:1; /* flag for no OP calculation before AC */
 };
 
-#endif /*TSK*/
+#endif
diff --git a/src/include/ngspice/twodev.h b/src/include/ngspice/twodev.h
index 37dc1740f..635dbc67f 100644
--- a/src/include/ngspice/twodev.h
+++ b/src/include/ngspice/twodev.h
@@ -104,4 +104,4 @@ struct mosConductances
     double dIgDVgb;
 };
 
-#endif /* TWODEV_H */
+#endif
diff --git a/src/include/ngspice/twomesh.h b/src/include/ngspice/twomesh.h
index c7f5e4938..0173113b9 100644
--- a/src/include/ngspice/twomesh.h
+++ b/src/include/ngspice/twomesh.h
@@ -209,4 +209,4 @@ typedef struct sTWOnode {
 #define TWOnumNodeStates 5
 #define TWOnumEdgeStates 2
 
-#endif /* TWOMESH_H */
+#endif
diff --git a/src/include/ngspice/wstdio.h b/src/include/ngspice/wstdio.h
index 014364b06..ca50e9981 100644
--- a/src/include/ngspice/wstdio.h
+++ b/src/include/ngspice/wstdio.h
@@ -102,5 +102,5 @@ int    fp_u_t_char(int __c);
 
 /*----------------------------------------------------------------------------*/
 
-#endif /* WSTDIO_H */
+#endif
 
diff --git a/src/maths/misc/accuracy.h b/src/maths/misc/accuracy.h
index df3eeea45..162f18ae6 100644
--- a/src/maths/misc/accuracy.h
+++ b/src/maths/misc/accuracy.h
@@ -19,4 +19,4 @@ extern double MuLim, MutLim;
 
 extern void evalAccLimits(void);
 
-#endif /* ACCURACY_H */
+#endif
diff --git a/src/maths/misc/bernoull.h b/src/maths/misc/bernoull.h
index 79d5823f3..5716d032f 100644
--- a/src/maths/misc/bernoull.h
+++ b/src/maths/misc/bernoull.h
@@ -12,4 +12,4 @@
 extern void bernoulli (double, double *, double *, double *, 
                        double *, BOOLEAN);
 
-#endif /* BERNOULL_H */
+#endif
diff --git a/src/maths/misc/norm.h b/src/maths/misc/norm.h
index fdc496624..d331a2ab1 100644
--- a/src/maths/misc/norm.h
+++ b/src/maths/misc/norm.h
@@ -14,4 +14,4 @@ extern double oneNorm(double *, int);
 extern double  l2Norm(double *, int);
 extern double     dot(double *, double *, int);
 
-#endif /* NORM_H */
+#endif
diff --git a/src/maths/sparse/spconfig.h b/src/maths/sparse/spconfig.h
index 0e12b94ad..c946368f5 100644
--- a/src/maths/sparse/spconfig.h
+++ b/src/maths/sparse/spconfig.h
@@ -399,4 +399,4 @@
 #define  FULL                   2
 
 #endif /* spINSIDE_SPARSE */
-#endif /* spCONFIG_DEFS */
+#endif