diff --git a/include/verilated.cpp b/include/verilated.cpp
index 3ead38546..e5ad06077 100644
--- a/include/verilated.cpp
+++ b/include/verilated.cpp
@@ -30,7 +30,6 @@
 #include <cctype>
 #include <cerrno>
 #include <sstream>
-#include <tgmath.h>
 #include <sys/stat.h>  // mkdir
 
 // clang-format off
diff --git a/include/verilated_fst_c.cpp b/include/verilated_fst_c.cpp
index a435e68dc..fd7ac796c 100644
--- a/include/verilated_fst_c.cpp
+++ b/include/verilated_fst_c.cpp
@@ -36,17 +36,12 @@
 #include "gtkwave/lz4.c"
 
 #include <algorithm>
-#include <cerrno>
-#include <ctime>
-#include <fcntl.h>
 #include <iterator>
 #include <sstream>
-#include <sys/stat.h>
 
 #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 # include <io.h>
 #else
-# include <stdint.h>
 # include <unistd.h>
 #endif
 
diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp
index 2209423df..2387275a5 100644
--- a/include/verilated_vcd_c.cpp
+++ b/include/verilated_vcd_c.cpp
@@ -27,7 +27,6 @@
 #include <cerrno>
 #include <ctime>
 #include <fcntl.h>
-#include <sys/stat.h>
 
 #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 # include <io.h>
@@ -35,8 +34,6 @@
 # include <unistd.h>
 #endif
 
-#include "verilated_intrinsics.h"
-
 // SPDIFF_ON
 
 #ifndef O_LARGEFILE  // For example on WIN32
diff --git a/include/verilated_vpi.cpp b/include/verilated_vpi.cpp
index 43da0ad88..73afdae2d 100644
--- a/include/verilated_vpi.cpp
+++ b/include/verilated_vpi.cpp
@@ -30,7 +30,6 @@
 #include <list>
 #include <map>
 #include <set>
-#include <sstream>
 
 //======================================================================
 // Internal constants
diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp
index 254301efa..501c9039f 100644
--- a/src/V3Assert.cpp
+++ b/src/V3Assert.cpp
@@ -23,9 +23,6 @@
 #include "V3GraphDfa.h"
 #include "V3Stats.h"
 
-#include <cstdarg>
-#include <iomanip>
-
 //######################################################################
 // Assert class functions
 
diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp
index 0cd815b40..c23e1bd75 100644
--- a/src/V3AssertPre.cpp
+++ b/src/V3AssertPre.cpp
@@ -23,9 +23,6 @@
 #include "V3Global.h"
 #include "V3AssertPre.h"
 
-#include <cstdarg>
-#include <iomanip>
-
 //######################################################################
 // Assert class functions
 
diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index 33e155ab5..6db1ce188 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -23,7 +23,6 @@
 #include "V3Broken.h"
 #include "V3String.h"
 
-#include <cstdarg>
 #include <iomanip>
 #include <memory>
 
diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
index e3a2bba02..8c98444db 100644
--- a/src/V3AstNodes.cpp
+++ b/src/V3AstNodes.cpp
@@ -24,7 +24,6 @@
 #include "V3PartitionGraph.h"  // Just for mtask dumping
 #include "V3EmitCBase.h"
 
-#include <cstdarg>
 #include <iomanip>
 #include <vector>
 
diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp
index 900f1f6f6..30ae3cbc5 100644
--- a/src/V3Begin.cpp
+++ b/src/V3Begin.cpp
@@ -30,12 +30,9 @@
 
 #include "V3Global.h"
 #include "V3Begin.h"
-#include "V3Inst.h"
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
-#include <vector>
 
 //######################################################################
 
diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp
index b89dc427d..94123dd6a 100644
--- a/src/V3Branch.cpp
+++ b/src/V3Branch.cpp
@@ -30,7 +30,6 @@
 #include "V3Branch.h"
 #include "V3Ast.h"
 
-#include <cstdarg>
 #include <map>
 
 //######################################################################
diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp
index 1ea4e179a..e9371d2be 100644
--- a/src/V3Broken.cpp
+++ b/src/V3Broken.cpp
@@ -32,7 +32,6 @@
 #include "V3AstConstOnly.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include VL_INCLUDE_UNORDERED_MAP
 
 //######################################################################
diff --git a/src/V3CCtors.cpp b/src/V3CCtors.cpp
index 2d56c83a9..483894a52 100644
--- a/src/V3CCtors.cpp
+++ b/src/V3CCtors.cpp
@@ -32,10 +32,7 @@
 #include "V3CCtors.h"
 
 #include <algorithm>
-#include <cmath>
-#include <cstdarg>
 #include <map>
-#include <vector>
 
 class V3CCtorsVisitor {
 private:
diff --git a/src/V3Case.cpp b/src/V3Case.cpp
index 949908a98..e359443fc 100644
--- a/src/V3Case.cpp
+++ b/src/V3Case.cpp
@@ -43,7 +43,6 @@
 #include "V3Stats.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 #define CASE_OVERLAP_WIDTH 16  // Maximum width we can check for overlaps in
 #define CASE_BARF 999999  // Magic width when non-constant
diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp
index 7b5c70079..d8f24070f 100644
--- a/src/V3Cast.cpp
+++ b/src/V3Cast.cpp
@@ -45,7 +45,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 // Cast state, as a visitor of each AstNode
diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp
index 15bcff4c7..7c06d6435 100644
--- a/src/V3Cdc.cpp
+++ b/src/V3Cdc.cpp
@@ -33,12 +33,9 @@
 #include "V3File.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <deque>
 #include <iomanip>
-#include <list>
 #include <memory>
-#include <vector>
 
 #define CDC_WEIGHT_ASYNC 0x1000  // Weight for edges that feed async logic
 
diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp
index 164e3b314..47be72d4c 100644
--- a/src/V3Changed.cpp
+++ b/src/V3Changed.cpp
@@ -35,8 +35,6 @@
 #include "V3EmitCBase.h"
 
 #include <algorithm>
-#include <cstdarg>
-#include <set>
 
 //######################################################################
 
diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp
index 6bf301174..274c628c5 100644
--- a/src/V3Clean.cpp
+++ b/src/V3Clean.cpp
@@ -31,7 +31,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 // Clean state, as a visitor of each AstNode
diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp
index 5e89b0e72..c590a52f8 100644
--- a/src/V3Clock.cpp
+++ b/src/V3Clock.cpp
@@ -36,7 +36,6 @@
 #include "V3EmitCBase.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 // Clock state, as a visitor of each AstNode
diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp
index 2f2a70423..5d667f1d5 100644
--- a/src/V3Combine.cpp
+++ b/src/V3Combine.cpp
@@ -40,7 +40,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/V3Const.cpp b/src/V3Const.cpp
index 4f8419545..fb3456d78 100644
--- a/src/V3Const.cpp
+++ b/src/V3Const.cpp
@@ -31,7 +31,6 @@
 #include "V3Simulate.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 
 //######################################################################
diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp
index c75bedc0a..9a0306f27 100644
--- a/src/V3Coverage.cpp
+++ b/src/V3Coverage.cpp
@@ -31,7 +31,6 @@
 #include "V3Coverage.h"
 #include "V3Ast.h"
 
-#include <cstdarg>
 #include <map>
 
 //######################################################################
diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp
index d25bd8c8f..b0b1025ac 100644
--- a/src/V3CoverageJoin.cpp
+++ b/src/V3CoverageJoin.cpp
@@ -25,7 +25,6 @@
 #include "V3Hashed.h"
 #include "V3Stats.h"
 
-#include <cstdarg>
 #include <vector>
 
 //######################################################################
diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp
index 4db5965f7..62f1536ca 100644
--- a/src/V3Dead.cpp
+++ b/src/V3Dead.cpp
@@ -41,7 +41,6 @@
 #include "V3Dead.h"
 #include "V3Ast.h"
 
-#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp
index b0187caaf..e0f67f03e 100644
--- a/src/V3Delayed.cpp
+++ b/src/V3Delayed.cpp
@@ -57,7 +57,6 @@
 #include "V3Stats.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <deque>
 #include <map>
 
diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp
index ae23d3cd2..9ca85d2ef 100644
--- a/src/V3Depth.cpp
+++ b/src/V3Depth.cpp
@@ -31,7 +31,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 
diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp
index 04fab51f6..55000a20a 100644
--- a/src/V3DepthBlock.cpp
+++ b/src/V3DepthBlock.cpp
@@ -29,7 +29,6 @@
 #include "V3EmitCBase.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 
diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp
index 4f4966a60..d969ec144 100644
--- a/src/V3Descope.cpp
+++ b/src/V3Descope.cpp
@@ -30,7 +30,6 @@
 #include "V3Ast.h"
 #include "V3EmitCBase.h"
 
-#include <cstdarg>
 #include <map>
 
 //######################################################################
diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index df85e6e54..fff5d2798 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -26,8 +26,6 @@
 #include "V3TSP.h"
 
 #include <algorithm>
-#include <cmath>
-#include <cstdarg>
 #include <map>
 #include <vector>
 #include VL_INCLUDE_UNORDERED_SET
diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp
index 0322d5573..39a2f4fd6 100644
--- a/src/V3EmitCInlines.cpp
+++ b/src/V3EmitCInlines.cpp
@@ -22,10 +22,7 @@
 #include "V3EmitCBase.h"
 #include "V3Stats.h"
 
-#include <cmath>
-#include <cstdarg>
 #include <map>
-#include <vector>
 
 //######################################################################
 
diff --git a/src/V3EmitCMain.cpp b/src/V3EmitCMain.cpp
index ac05e2048..6eba5ec84 100644
--- a/src/V3EmitCMain.cpp
+++ b/src/V3EmitCMain.cpp
@@ -22,10 +22,7 @@
 #include "V3EmitCBase.h"
 #include "V3EmitCMain.h"
 
-#include <cmath>
-#include <cstdarg>
 #include <map>
-#include <vector>
 
 //######################################################################
 
diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp
index dc069f92b..f64d94a25 100644
--- a/src/V3EmitCSyms.cpp
+++ b/src/V3EmitCSyms.cpp
@@ -23,10 +23,7 @@
 #include "V3LanguageWords.h"
 
 #include <algorithm>
-#include <cmath>
-#include <cstdarg>
 #include <map>
-#include <set>
 #include <vector>
 
 //######################################################################
diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp
index 34ba8ae1c..d53f14eb8 100644
--- a/src/V3EmitV.cpp
+++ b/src/V3EmitV.cpp
@@ -22,8 +22,6 @@
 #include "V3EmitCBase.h"
 
 #include <algorithm>
-#include <cmath>
-#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp
index a748aecdc..2ba9d98a8 100644
--- a/src/V3EmitXml.cpp
+++ b/src/V3EmitXml.cpp
@@ -22,9 +22,6 @@
 #include "V3EmitXml.h"
 #include "V3EmitCBase.h"
 
-#include <algorithm>
-#include <cmath>
-#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/V3Error.cpp b/src/V3Error.cpp
index e483c0699..14be86818 100644
--- a/src/V3Error.cpp
+++ b/src/V3Error.cpp
@@ -23,8 +23,6 @@
 #endif
 // clang-format on
 
-#include <cstdarg>
-
 //======================================================================
 // Statics
 
diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp
index c097a32de..4430a25eb 100644
--- a/src/V3Expand.cpp
+++ b/src/V3Expand.cpp
@@ -33,7 +33,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 // Expand state, as a visitor of each AstNode
diff --git a/src/V3File.cpp b/src/V3File.cpp
index a01457afd..fc985a081 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -20,7 +20,6 @@
 #include "V3Global.h"
 #include "V3File.h"
 #include "V3Os.h"
-#include "V3PreShell.h"
 #include "V3String.h"
 #include "V3Ast.h"
 
diff --git a/src/V3FileLine.cpp b/src/V3FileLine.cpp
index 2123a5f1b..1ff759762 100644
--- a/src/V3FileLine.cpp
+++ b/src/V3FileLine.cpp
@@ -22,9 +22,7 @@
 #include "V3FileLine.h"
 #include "V3String.h"
 #ifndef _V3ERROR_NO_GLOBAL_
-# include "V3Ast.h"
 # include "V3Global.h"
-# include "V3Stats.h"
 # include "V3Config.h"
 # include "V3File.h"
 #endif
@@ -32,7 +30,6 @@
 // clang-format on
 
 #include <algorithm>
-#include <cstdarg>
 #include <iomanip>
 #include VL_INCLUDE_UNORDERED_SET
 
diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp
index fe280677b..cf3676f2b 100644
--- a/src/V3Gate.cpp
+++ b/src/V3Gate.cpp
@@ -33,11 +33,8 @@
 #include "V3Hashed.h"
 
 #include <algorithm>
-#include <cstdarg>
-#include <iomanip>
 #include <list>
 #include <map>
-#include <vector>
 #include VL_INCLUDE_UNORDERED_SET
 
 typedef std::list<AstNodeVarRef*> GateVarRefList;
diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp
index 5cef03170..135d1394a 100644
--- a/src/V3GenClk.cpp
+++ b/src/V3GenClk.cpp
@@ -26,8 +26,6 @@
 #include "V3GenClk.h"
 #include "V3Ast.h"
 
-#include <cstdarg>
-
 //######################################################################
 // GenClk state, as a visitor of each AstNode
 
diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp
index a9c35e8ce..0b91d6ac4 100644
--- a/src/V3Graph.cpp
+++ b/src/V3Graph.cpp
@@ -21,7 +21,6 @@
 #include "V3File.h"
 #include "V3Graph.h"
 
-#include <cstdarg>
 #include <map>
 #include <memory>
 #include <vector>
diff --git a/src/V3GraphAcyc.cpp b/src/V3GraphAcyc.cpp
index 7e57b078e..ca57a82ee 100644
--- a/src/V3GraphAcyc.cpp
+++ b/src/V3GraphAcyc.cpp
@@ -21,7 +21,6 @@
 #include "V3Graph.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <list>
 #include <vector>
 
diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp
index 95db5be4f..d82babee4 100644
--- a/src/V3GraphAlg.cpp
+++ b/src/V3GraphAlg.cpp
@@ -21,7 +21,6 @@
 #include "V3GraphAlg.h"
 #include "V3GraphPathChecker.h"
 
-#include <cstdarg>
 #include <algorithm>
 #include <vector>
 #include <map>
diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp
index 69160fbfd..ad0c1ffed 100644
--- a/src/V3GraphDfa.cpp
+++ b/src/V3GraphDfa.cpp
@@ -21,7 +21,6 @@
 #include "V3GraphDfa.h"
 #include "V3GraphAlg.h"
 
-#include <cstdarg>
 #include <map>
 #include <set>
 #include <stack>
diff --git a/src/V3GraphTest.cpp b/src/V3GraphTest.cpp
index 232cb01b0..19f489f0c 100644
--- a/src/V3GraphTest.cpp
+++ b/src/V3GraphTest.cpp
@@ -21,8 +21,6 @@
 #include "V3Graph.h"
 #include "V3GraphDfa.h"
 
-#include <cstdarg>
-
 //######################################################################
 //######################################################################
 // Test class
diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp
index ee7208147..10f1fe7dd 100644
--- a/src/V3Hashed.cpp
+++ b/src/V3Hashed.cpp
@@ -30,7 +30,6 @@
 #include "V3File.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <iomanip>
 #include <map>
 #include <memory>
diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp
index 49c795669..301590f3b 100644
--- a/src/V3Inline.cpp
+++ b/src/V3Inline.cpp
@@ -35,7 +35,6 @@
 #include "V3String.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <vector>
 #include VL_INCLUDE_UNORDERED_SET
 
diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp
index 6883d4b7a..2b4d71ca8 100644
--- a/src/V3Inst.cpp
+++ b/src/V3Inst.cpp
@@ -27,11 +27,9 @@
 #include "V3Global.h"
 #include "V3Inst.h"
 #include "V3Ast.h"
-#include "V3Changed.h"
 #include "V3Const.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 // Inst state, as a visitor of each AstNode
diff --git a/src/V3Life.cpp b/src/V3Life.cpp
index 5172dab1e..1462ee4c4 100644
--- a/src/V3Life.cpp
+++ b/src/V3Life.cpp
@@ -32,7 +32,6 @@
 #include "V3Ast.h"
 #include "V3Const.h"
 
-#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp
index da75454bb..80c72f749 100644
--- a/src/V3LifePost.cpp
+++ b/src/V3LifePost.cpp
@@ -34,7 +34,6 @@
 #include "V3Stats.h"
 #include "V3Ast.h"
 
-#include <cstdarg>
 #include <memory>  // for vl_unique_ptr -> auto_ptr or unique_ptr
 #include VL_INCLUDE_UNORDERED_MAP
 
diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp
index 17fe78662..e55660d70 100644
--- a/src/V3LinkCells.cpp
+++ b/src/V3LinkCells.cpp
@@ -34,7 +34,6 @@
 #include "V3Graph.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>
 #include VL_INCLUDE_UNORDERED_SET
diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp
index 9856c8b3b..df2da2803 100644
--- a/src/V3LinkDot.cpp
+++ b/src/V3LinkDot.cpp
@@ -71,7 +71,6 @@
 #include "V3String.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/V3LinkInc.cpp b/src/V3LinkInc.cpp
index fa168580d..9c8a645b1 100644
--- a/src/V3LinkInc.cpp
+++ b/src/V3LinkInc.cpp
@@ -44,8 +44,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
-#include <vector>
 
 //######################################################################
 
diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp
index 3b02c867a..3c9185b33 100644
--- a/src/V3LinkJump.cpp
+++ b/src/V3LinkJump.cpp
@@ -37,7 +37,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <vector>
 
 //######################################################################
diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp
index 697472e49..915501d51 100644
--- a/src/V3LinkLValue.cpp
+++ b/src/V3LinkLValue.cpp
@@ -25,10 +25,7 @@
 #include "V3LinkLValue.h"
 #include "V3Ast.h"
 
-#include <algorithm>
-#include <cstdarg>
 #include <map>
-#include <vector>
 
 //######################################################################
 // Link state, as a visitor of each AstNode
diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp
index 7231c96eb..e0049d6ef 100644
--- a/src/V3LinkLevel.cpp
+++ b/src/V3LinkLevel.cpp
@@ -27,7 +27,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>
 
diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp
index aae9f23c3..b8cdb6da0 100644
--- a/src/V3LinkParse.cpp
+++ b/src/V3LinkParse.cpp
@@ -27,7 +27,6 @@
 #include "V3Config.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <set>
 #include <vector>
diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp
index 22b442fe6..a6074a554 100644
--- a/src/V3LinkResolve.cpp
+++ b/src/V3LinkResolve.cpp
@@ -33,9 +33,7 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
-#include <vector>
 
 //######################################################################
 // Link state, as a visitor of each AstNode
diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp
index bf400cee3..3a9b17946 100644
--- a/src/V3Localize.cpp
+++ b/src/V3Localize.cpp
@@ -30,7 +30,6 @@
 #include "V3Stats.h"
 #include "V3Ast.h"
 
-#include <cstdarg>
 #include <vector>
 
 //######################################################################
diff --git a/src/V3Name.cpp b/src/V3Name.cpp
index e1004b0ef..bd0e7bb22 100644
--- a/src/V3Name.cpp
+++ b/src/V3Name.cpp
@@ -25,12 +25,8 @@
 #include "V3Global.h"
 #include "V3Name.h"
 #include "V3Ast.h"
-#include "V3File.h"
 #include "V3LanguageWords.h"
 
-#include <algorithm>
-#include <cstdarg>
-
 //######################################################################
 // Name state, as a visitor of each AstNode
 
diff --git a/src/V3Number.cpp b/src/V3Number.cpp
index 115fee618..cfa797013 100644
--- a/src/V3Number.cpp
+++ b/src/V3Number.cpp
@@ -24,8 +24,6 @@
 #include <algorithm>
 #include <cerrno>
 #include <cmath>
-#include <cstdarg>
-#include <iomanip>
 
 #define MAX_SPRINTF_DOUBLE_SIZE 1100  // Maximum characters with a sprintf %e/%f/%g (really 1079)
 
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index 1b19b26dd..c833abe50 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -94,7 +94,6 @@
 #include "V3OrderGraph.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <deque>
 #include <iomanip>
 #include <map>
diff --git a/src/V3Os.cpp b/src/V3Os.cpp
index d32023339..74b7495a2 100644
--- a/src/V3Os.cpp
+++ b/src/V3Os.cpp
@@ -29,17 +29,13 @@
 #include "verilatedos.h"
 
 // Limited V3 headers here - this is a base class for Vlc etc
-#include "V3Global.h"
 #include "V3String.h"
 #include "V3Os.h"
 
 #include <cerrno>
-#include <climits>
 #include <cstdarg>
 #include <dirent.h>
-#include <fcntl.h>
 #include <fstream>
-#include <iomanip>
 #include <memory>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -54,7 +50,7 @@
 # include <thread>
 #else
 # include <sys/time.h>
-# include <sys/wait.h>
+# include <sys/wait.h> // Needed on FreeBSD for WIFEXITED
 # include <unistd.h>  // usleep
 #endif
 // clang-format on
diff --git a/src/V3Param.cpp b/src/V3Param.cpp
index 87a05339e..64e14916a 100644
--- a/src/V3Param.cpp
+++ b/src/V3Param.cpp
@@ -56,7 +56,6 @@
 #include "V3Unroll.h"
 #include "V3Hashed.h"
 
-#include <cstdarg>
 #include <deque>
 #include <map>
 #include <vector>
diff --git a/src/V3ParseImp.cpp b/src/V3ParseImp.cpp
index be019ff31..510d32047 100644
--- a/src/V3ParseImp.cpp
+++ b/src/V3ParseImp.cpp
@@ -34,8 +34,6 @@
 #include "V3PreShell.h"
 #include "V3LanguageWords.h"
 
-#include <cstdarg>
-#include <fstream>
 #include <sstream>
 
 //======================================================================
diff --git a/src/V3ParseLex.cpp b/src/V3ParseLex.cpp
index ac314f909..14100969a 100644
--- a/src/V3ParseLex.cpp
+++ b/src/V3ParseLex.cpp
@@ -17,12 +17,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
-#include "V3Global.h"
-#include "V3File.h"
 #include "V3ParseImp.h"
 
-#include <cstdarg>
 #include <fstream>
 
 //======================================================================
diff --git a/src/V3Partition.cpp b/src/V3Partition.cpp
index 9f4edc2f8..aca9696c1 100644
--- a/src/V3Partition.cpp
+++ b/src/V3Partition.cpp
@@ -20,7 +20,6 @@
 #include "V3Os.h"
 #include "V3File.h"
 #include "V3GraphAlg.h"
-#include "V3GraphPathChecker.h"
 #include "V3GraphStream.h"
 #include "V3InstrCount.h"
 #include "V3Partition.h"
diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp
index 9c2cbe651..d4595131e 100644
--- a/src/V3PreProc.cpp
+++ b/src/V3PreProc.cpp
@@ -26,7 +26,6 @@
 #include "V3PreShell.h"
 #include "V3String.h"
 
-#include <cstdarg>
 #include <cstdlib>
 #include <fstream>
 #include <stack>
diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp
index 714f2ac22..2695051a4 100644
--- a/src/V3PreShell.cpp
+++ b/src/V3PreShell.cpp
@@ -25,10 +25,7 @@
 #include "V3Os.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <iostream>
-#include <list>
-#include <set>
 
 //######################################################################
 
diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp
index e4271defa..2b75eafa6 100644
--- a/src/V3Premit.cpp
+++ b/src/V3Premit.cpp
@@ -32,8 +32,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
-#include <list>
 
 //######################################################################
 // Structure for global state
diff --git a/src/V3ProtectLib.cpp b/src/V3ProtectLib.cpp
index 7445cc1c5..c04726c8b 100644
--- a/src/V3ProtectLib.cpp
+++ b/src/V3ProtectLib.cpp
@@ -20,7 +20,6 @@
 #include "V3Global.h"
 #include "V3String.h"
 #include "V3ProtectLib.h"
-#include "V3File.h"
 #include "V3Hashed.h"
 #include "V3Task.h"
 
diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp
index 350aa2dd2..05b090a72 100644
--- a/src/V3Reloop.cpp
+++ b/src/V3Reloop.cpp
@@ -38,7 +38,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 #define RELOOP_MIN_ITERS 40  // Need at least this many loops to do this optimization
 
diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp
index db9a10bec..755ed82e2 100644
--- a/src/V3Scope.cpp
+++ b/src/V3Scope.cpp
@@ -29,8 +29,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
-#include <iomanip>
 #include <map>
 #include VL_INCLUDE_UNORDERED_MAP
 #include VL_INCLUDE_UNORDERED_SET
diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp
index 2958c5aa0..2c41c1db6 100644
--- a/src/V3Slice.cpp
+++ b/src/V3Slice.cpp
@@ -42,8 +42,6 @@
 #include "V3Slice.h"
 #include "V3Ast.h"
 
-#include <cstdarg>
-
 //*************************************************************************
 
 class SliceVisitor : public AstNVisitor {
diff --git a/src/V3Split.cpp b/src/V3Split.cpp
index 6e69257d3..bca88e300 100644
--- a/src/V3Split.cpp
+++ b/src/V3Split.cpp
@@ -87,7 +87,6 @@
 #include "V3Graph.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>
 #include VL_INCLUDE_UNORDERED_MAP
diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp
index d600cc819..3aa5a4c2a 100644
--- a/src/V3SplitAs.cpp
+++ b/src/V3SplitAs.cpp
@@ -29,10 +29,7 @@
 #include "V3Stats.h"
 #include "V3Ast.h"
 
-#include <algorithm>
-#include <cstdarg>
 #include <map>
-#include <vector>
 
 //######################################################################
 
diff --git a/src/V3SplitVar.cpp b/src/V3SplitVar.cpp
index 1394ea679..5cc78823a 100644
--- a/src/V3SplitVar.cpp
+++ b/src/V3SplitVar.cpp
@@ -114,7 +114,6 @@
 #include "verilatedos.h"
 
 #include "V3Ast.h"
-#include "V3Const.h"
 #include "V3Global.h"
 #include "V3SplitVar.h"
 #include "V3Stats.h"
diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp
index c63488f13..e9741ac8d 100644
--- a/src/V3Stats.cpp
+++ b/src/V3Stats.cpp
@@ -20,12 +20,10 @@
 #include "V3Global.h"
 #include "V3Stats.h"
 #include "V3Ast.h"
-#include "V3File.h"
 
 // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators
 #include "V3AstConstOnly.h"
 
-#include <cstdarg>
 #include <iomanip>
 #include <map>
 
diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp
index 6ce36bf70..107d1d08d 100644
--- a/src/V3StatsReport.cpp
+++ b/src/V3StatsReport.cpp
@@ -23,7 +23,6 @@
 #include "V3File.h"
 #include "V3Os.h"
 
-#include <cstdarg>
 #include <iomanip>
 #include <map>
 #include VL_INCLUDE_UNORDERED_MAP
diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp
index f79964434..d86f50864 100644
--- a/src/V3Subst.cpp
+++ b/src/V3Subst.cpp
@@ -27,12 +27,10 @@
 
 #include "V3Global.h"
 #include "V3Subst.h"
-#include "V3Const.h"
 #include "V3Stats.h"
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <vector>
 
 //######################################################################
diff --git a/src/V3TSP.cpp b/src/V3TSP.cpp
index 57f22c16e..617653c0e 100644
--- a/src/V3TSP.cpp
+++ b/src/V3TSP.cpp
@@ -28,17 +28,12 @@
 #include "V3Graph.h"
 #include "V3TSP.h"
 
-#include <cassert>
 #include <cmath>
-#include <fstream>
-#include <limits>
 #include <list>
-#include <map>
 #include <memory>
 #include <set>
 #include <sstream>
 #include <string>
-#include <utility>
 #include <vector>
 #include VL_INCLUDE_UNORDERED_SET
 #include VL_INCLUDE_UNORDERED_MAP
diff --git a/src/V3Table.cpp b/src/V3Table.cpp
index 9c1754e57..43eeef696 100644
--- a/src/V3Table.cpp
+++ b/src/V3Table.cpp
@@ -31,7 +31,6 @@
 #include "V3Ast.h"
 
 #include <cmath>
-#include <cstdarg>
 #include <deque>
 
 //######################################################################
diff --git a/src/V3Task.cpp b/src/V3Task.cpp
index e7a718290..30ef04ec9 100644
--- a/src/V3Task.cpp
+++ b/src/V3Task.cpp
@@ -29,13 +29,11 @@
 #include "V3Global.h"
 #include "V3Const.h"
 #include "V3Task.h"
-#include "V3Inst.h"
 #include "V3Ast.h"
 #include "V3EmitCBase.h"
 #include "V3Graph.h"
 #include "V3LinkLValue.h"
 
-#include <cstdarg>
 #include <map>
 
 //######################################################################
diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp
index c2c0e8436..184f92571 100644
--- a/src/V3Tristate.cpp
+++ b/src/V3Tristate.cpp
@@ -60,14 +60,11 @@
 #include "V3Global.h"
 #include "V3Tristate.h"
 #include "V3Ast.h"
-#include "V3Const.h"
 #include "V3Stats.h"
 #include "V3Inst.h"
-#include "V3Stats.h"
 #include "V3Graph.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <map>
 
 //######################################################################
diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp
index 0bc57da59..d0b48debc 100644
--- a/src/V3Undriven.cpp
+++ b/src/V3Undriven.cpp
@@ -32,7 +32,6 @@
 #include "V3Ast.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <vector>
 
 //######################################################################
diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp
index 5abbd20c0..d0769702d 100644
--- a/src/V3Unknown.cpp
+++ b/src/V3Unknown.cpp
@@ -38,7 +38,6 @@
 #include "V3Stats.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 
diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp
index 19b06ffd5..6d1eb0cb7 100644
--- a/src/V3Unroll.cpp
+++ b/src/V3Unroll.cpp
@@ -35,7 +35,6 @@
 #include "V3Simulate.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 //######################################################################
 // Unroll state, as a visitor of each AstNode
diff --git a/src/V3Waiver.cpp b/src/V3Waiver.cpp
index 153c1c12f..cc62c823b 100644
--- a/src/V3Waiver.cpp
+++ b/src/V3Waiver.cpp
@@ -19,7 +19,6 @@
 #include "V3Waiver.h"
 
 #include <memory>
-#include <fstream>
 #include <sstream>
 
 void V3Waiver::addEntry(V3ErrorCode errorCode, const std::string& filename,
diff --git a/src/V3Width.cpp b/src/V3Width.cpp
index 292ecf6c3..940d50ea8 100644
--- a/src/V3Width.cpp
+++ b/src/V3Width.cpp
@@ -74,7 +74,6 @@
 #include "V3Task.h"
 
 #include <algorithm>
-#include <cstdarg>
 
 // More code; this file was getting too large; see actions there
 #define _V3WIDTH_CPP_
diff --git a/src/V3WidthSel.cpp b/src/V3WidthSel.cpp
index 8e539443e..65eff9830 100644
--- a/src/V3WidthSel.cpp
+++ b/src/V3WidthSel.cpp
@@ -33,8 +33,6 @@
 #include "V3Width.h"
 #include "V3Const.h"
 
-#include <cstdarg>
-
 //######################################################################
 // Width state, as a visitor of each AstNode
 
diff --git a/src/Verilator.cpp b/src/Verilator.cpp
index f793f4388..02fe2b38e 100644
--- a/src/Verilator.cpp
+++ b/src/Verilator.cpp
@@ -56,7 +56,6 @@
 #include "V3Inst.h"
 #include "V3Life.h"
 #include "V3LifePost.h"
-#include "V3LinkCells.h"
 #include "V3LinkDot.h"
 #include "V3LinkJump.h"
 #include "V3LinkInc.h"
@@ -70,7 +69,6 @@
 #include "V3Order.h"
 #include "V3Os.h"
 #include "V3Param.h"
-#include "V3Parse.h"
 #include "V3ParseSym.h"
 #include "V3Partition.h"
 #include "V3PreShell.h"
@@ -99,7 +97,6 @@
 #include "V3Width.h"
 
 #include <ctime>
-#include <sys/stat.h>
 
 V3Global v3Global;
 
diff --git a/src/VlcTop.cpp b/src/VlcTop.cpp
index 91a9ff4b4..ad02fc61d 100644
--- a/src/VlcTop.cpp
+++ b/src/VlcTop.cpp
@@ -21,7 +21,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <sys/stat.h>
 
 //######################################################################
 
diff --git a/src/verilog.l b/src/verilog.l
index 663bc67f7..6635286ac 100644
--- a/src/verilog.l
+++ b/src/verilog.l
@@ -22,8 +22,6 @@
 #include "V3ParseImp.h"  // Defines YYTYPE; before including bison header
 #include "V3ParseBison.h"  // Generated by bison
 
-#include <cstdlib>
-
 extern void yyerror(const char*);
 extern void yyerrorf(const char* format, ...);