diff --git a/src/spicelib/devices/bjt/bjtdefs.h b/src/spicelib/devices/bjt/bjtdefs.h
index 07d40622d..78a030289 100644
--- a/src/spicelib/devices/bjt/bjtdefs.h
+++ b/src/spicelib/devices/bjt/bjtdefs.h
@@ -24,11 +24,10 @@ enum {
     BJTIBNOIZ,
     BJTFLNOIZ,
     BJTTOTNOIZ,
-    BJTNSRCS,
+    /* finally, the number of noise sources */
+    BJTNSRCS
 };
 
-     /* the number of BJT noise sources */
-
 /* data needed to describe a single instance */
 
 typedef struct sBJTinstance {
diff --git a/src/spicelib/devices/dio/diodefs.h b/src/spicelib/devices/dio/diodefs.h
index 31fa5cb81..fbc936b7b 100644
--- a/src/spicelib/devices/dio/diodefs.h
+++ b/src/spicelib/devices/dio/diodefs.h
@@ -21,7 +21,8 @@ enum {
     DIOIDNOIZ,
     DIOFLNOIZ,
     DIOTOTNOIZ,
-    DIONSRCS,
+    /* finally, the number of noise sources */
+    DIONSRCS
 };
 
 /* information needed per instance */
diff --git a/src/spicelib/devices/jfet/jfetdefs.h b/src/spicelib/devices/jfet/jfetdefs.h
index 65e89eac2..3b1dc92d6 100644
--- a/src/spicelib/devices/jfet/jfetdefs.h
+++ b/src/spicelib/devices/jfet/jfetdefs.h
@@ -25,7 +25,8 @@ enum {
     JFETIDNOIZ,
     JFETFLNOIZ,
     JFETTOTNOIZ,
-    JFETNSRCS,
+    /* finally, the number of noise sources */
+    JFETNSRCS
 };
 
 /* information used to describe a single instance */
diff --git a/src/spicelib/devices/jfet2/jfet2defs.h b/src/spicelib/devices/jfet2/jfet2defs.h
index f49bc754c..1a9be74c9 100644
--- a/src/spicelib/devices/jfet2/jfet2defs.h
+++ b/src/spicelib/devices/jfet2/jfet2defs.h
@@ -30,7 +30,8 @@ enum {
     JFET2IDNOIZ,
     JFET2FLNOIZ,
     JFET2TOTNOIZ,
-    JFET2NSRCS,
+    /* finally, the number of noise sources */
+    JFET2NSRCS
 };
 
 /* information used to describe a single instance */
diff --git a/src/spicelib/devices/mes/mesdefs.h b/src/spicelib/devices/mes/mesdefs.h
index 5276c0b7d..89ad77c24 100644
--- a/src/spicelib/devices/mes/mesdefs.h
+++ b/src/spicelib/devices/mes/mesdefs.h
@@ -24,11 +24,10 @@ enum {
     MESIDNOIZ,
     MESFLNOIZ,
     MESTOTNOIZ,
-    MESNSRCS,
+    /* finally, the number of noise sources */
+    MESNSRCS
 };
 
-     /* the number of MESFET noise sources */
-
 /* information used to describe a single instance */
 
 typedef struct sMESinstance {
diff --git a/src/spicelib/devices/mesa/mesadefs.h b/src/spicelib/devices/mesa/mesadefs.h
index f50e633eb..3976c633c 100644
--- a/src/spicelib/devices/mesa/mesadefs.h
+++ b/src/spicelib/devices/mesa/mesadefs.h
@@ -22,11 +22,10 @@ enum {
     MESAIDNOIZ,
     MESAFLNOIZ,
     MESATOTNOIZ,
-    MESANSRCS,
+    /* finally, the number of noise sources */
+    MESANSRCS
 };
 
-     /* the number of MESAFET noise sources */
-
 /* information used to describe a single instance */
 
 typedef struct sMESAinstance {
diff --git a/src/spicelib/devices/mos1/mos1defs.h b/src/spicelib/devices/mos1/mos1defs.h
index 366b3e94c..c6f98a623 100644
--- a/src/spicelib/devices/mos1/mos1defs.h
+++ b/src/spicelib/devices/mos1/mos1defs.h
@@ -23,11 +23,10 @@ enum {
     MOS1IDNOIZ,
     MOS1FLNOIZ,
     MOS1TOTNOIZ,
-    MOS1NSRCS,
+    /* finally, the number of noise sources */
+    MOS1NSRCS
 };
 
-     /* the number of MOS1FET noise sources*/
-
 /* information needed for each instance */
 
 typedef struct sMOS1instance {
diff --git a/src/spicelib/devices/mos2/mos2defs.h b/src/spicelib/devices/mos2/mos2defs.h
index a3caa50eb..b937485fb 100644
--- a/src/spicelib/devices/mos2/mos2defs.h
+++ b/src/spicelib/devices/mos2/mos2defs.h
@@ -23,11 +23,10 @@ enum {
     MOS2IDNOIZ,
     MOS2FLNOIZ,
     MOS2TOTNOIZ,
-    MOS2NSRCS,
+    /* finally, the number of noise sources */
+    MOS2NSRCS
 };
 
-     /* the number of MOS2FET noise sources */
-
 /* information needed for each instance */
 
 typedef struct sMOS2instance {
diff --git a/src/spicelib/devices/mos3/mos3defs.h b/src/spicelib/devices/mos3/mos3defs.h
index af7b4caff..3f61aea80 100644
--- a/src/spicelib/devices/mos3/mos3defs.h
+++ b/src/spicelib/devices/mos3/mos3defs.h
@@ -23,11 +23,10 @@ enum {
     MOS3IDNOIZ,
     MOS3FLNOIZ,
     MOS3TOTNOIZ,
-    MOS3NSRCS,
+    /* finally, the number of noise sources */
+    MOS3NSRCS
 };
 
-     /* the number of MOSFET(3) noise sources */
-
 /* information needed for each instance */
 
 typedef struct sMOS3instance {
diff --git a/src/spicelib/devices/mos9/mos9defs.h b/src/spicelib/devices/mos9/mos9defs.h
index 1d60e6aa5..6f39b5019 100644
--- a/src/spicelib/devices/mos9/mos9defs.h
+++ b/src/spicelib/devices/mos9/mos9defs.h
@@ -23,11 +23,10 @@ enum {
     MOS9IDNOIZ,
     MOS9FLNOIZ,
     MOS9TOTNOIZ,
-    MOS9NSRCS,
+    /* finally, the number of noise sources */
+    MOS9NSRCS
 };
 
-     /* the number of MOSFET(9) noise sources */
-
 /* information needed for each instance */
 
 typedef struct sMOS9instance {
diff --git a/src/spicelib/devices/res/resdefs.h b/src/spicelib/devices/res/resdefs.h
index 5b2507161..cade85975 100644
--- a/src/spicelib/devices/res/resdefs.h
+++ b/src/spicelib/devices/res/resdefs.h
@@ -21,11 +21,10 @@ enum {
     RESTHNOIZ = 0,
     RESFLNOIZ,
     RESTOTNOIZ,
-    RESNSRCS,
+    /* finally, the number of noise sources */
+    RESNSRCS
 };
 
-     /* the number of RES noise sources */
-
 /* information used to describe a single instance */
 
 typedef struct sRESinstance {
diff --git a/src/spicelib/devices/soi3/soi3defs.h b/src/spicelib/devices/soi3/soi3defs.h
index 629c0a9b0..c0cd9c1fc 100644
--- a/src/spicelib/devices/soi3/soi3defs.h
+++ b/src/spicelib/devices/soi3/soi3defs.h
@@ -41,11 +41,10 @@ enum {
     SOI3IDNOIZ,
     SOI3FLNOIZ,
     SOI3TOTNOIZ,
-    SOI3NSRCS,
+    /* finally, the number of noise sources */
+    SOI3NSRCS
 };
 
-     /* the number of SOI(3) noise sources */
-
 /* information needed for each instance */
 
 typedef struct sSOI3instance {
diff --git a/src/spicelib/devices/vbic/vbicdefs.h b/src/spicelib/devices/vbic/vbicdefs.h
index 89cb74327..33e1414d7 100644
--- a/src/spicelib/devices/vbic/vbicdefs.h
+++ b/src/spicelib/devices/vbic/vbicdefs.h
@@ -33,11 +33,10 @@ enum {
     VBICFLBENOIZ,
     VBICFLBEPNOIZ,
     VBICTOTNOIZ,
-    VBICNSRCS,
+    /* finally, the number of noise sources */
+    VBICNSRCS
 };
 
-     /* the number of VBIC noise sources */
-
 /* data needed to describe a single instance */
 
 typedef struct sVBICinstance {