diff --git a/cppcheck.sup b/cppcheck.sup
index 0c003b15d..4023aa9a1 100644
--- a/cppcheck.sup
+++ b/cppcheck.sup
@@ -1,3 +1,3 @@
 // These are correct and are used to find the base (zero) pin.
-thisSubtraction:netlist.h:4169
-thisSubtraction:netlist.h:4178
+thisSubtraction:netlist.h:4326
+thisSubtraction:netlist.h:4335
diff --git a/vpi/cppcheck.sup b/vpi/cppcheck.sup
index 1ba0e2488..e22c85b1f 100644
--- a/vpi/cppcheck.sup
+++ b/vpi/cppcheck.sup
@@ -3,23 +3,23 @@
 // problems will not be fixed.
 
 // fstapi.c from GTKWave
-variableScope:fstapi.c:1713
-variableScope:fstapi.c:1841
-variableScope:fstapi.c:1935
-variableScope:fstapi.c:1936
-variableScope:fstapi.c:2642
-variableScope:fstapi.c:2962
-variableScope:fstapi.c:2966
-variableScope:fstapi.c:2967
-variableScope:fstapi.c:4641
+variableScope:fstapi.c:1717
+variableScope:fstapi.c:1975
+variableScope:fstapi.c:2119
+variableScope:fstapi.c:2278
+variableScope:fstapi.c:2279
+variableScope:fstapi.c:2986
+variableScope:fstapi.c:3314
+variableScope:fstapi.c:3323
+variableScope:fstapi.c:4990
 
 // lxt2_write.c from GTKWave
 variableScope:lxt2_write.c:63
 variableScope:lxt2_write.c:523
 variableScope:lxt2_write.c:581
 variableScope:lxt2_write.c:587
-variableScope:lxt2_write.c:1600
-variableScope:lxt2_write.c:2047
+variableScope:lxt2_write.c:1613
+variableScope:lxt2_write.c:2060
 
 // lxt_write.c from GTKWave
 variableScope:lxt_write.c:31
@@ -28,11 +28,11 @@ variableScope:lxt_write.c:640
 variableScope:lxt_write.c:1056
 variableScope:lxt_write.c:1057
 variableScope:lxt_write.c:1058
-variableScope:lxt_write.c:1841
-variableScope:lxt_write.c:2586
-variableScope:lxt_write.c:2587
-variableScope:lxt_write.c:2588
-variableScope:lxt_write.c:2589
+variableScope:lxt_write.c:1850
+variableScope:lxt_write.c:2595
+variableScope:lxt_write.c:2596
+variableScope:lxt_write.c:2597
+variableScope:lxt_write.c:2598
 
 // The routines in sys_random.c are exact copies from IEEE1364-2005 and
 // they have scope warnings that we need to ignore.
diff --git a/vvp/cppcheck.sup b/vvp/cppcheck.sup
index 2190f9696..7e63a54dc 100644
--- a/vvp/cppcheck.sup
+++ b/vvp/cppcheck.sup
@@ -1,3 +1,3 @@
 // The new() operator is always used to allocate space for this class and
 // pool is defined there.
-uninitVar:vvp_net.cc:164
+uninitVar:vvp_net.cc:167