Remove unused headers (#2389)

2020-05-31 20:21:07 +01:00 · 2020-05-31 20:21:07 +01:00 · 95534fa5c5
commit 95534fa5c5
parent 611e8b10c6
92 changed files with 1 additions and 163 deletions
--- 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
--- 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

--- 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
--- a/include/verilated_vpi.cpp
+++ b/include/verilated_vpi.cpp
@ -30,7 +30,6 @@
 #include <list>
 #include <map>
 #include <set>
-#include <sstream>

 //======================================================================
 // Internal constants
--- 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

--- 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

--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@ -23,7 +23,6 @@
 #include "V3Broken.h"
 #include "V3String.h"

-#include <cstdarg>
 #include <iomanip>
 #include <memory>

--- 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>

--- 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>

 //######################################################################

--- a/src/V3Branch.cpp
+++ b/src/V3Branch.cpp
@ -30,7 +30,6 @@
 #include "V3Branch.h"
 #include "V3Ast.h"

-#include <cstdarg>
 #include <map>

 //######################################################################
--- a/src/V3Broken.cpp
+++ b/src/V3Broken.cpp
@ -32,7 +32,6 @@
 #include "V3AstConstOnly.h"

 #include <algorithm>
-#include <cstdarg>
 #include VL_INCLUDE_UNORDERED_MAP

 //######################################################################
--- 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:
--- 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
--- 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
--- 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

--- a/src/V3Changed.cpp
+++ b/src/V3Changed.cpp
@ -35,8 +35,6 @@
 #include "V3EmitCBase.h"

 #include <algorithm>
-#include <cstdarg>
-#include <set>

 //######################################################################

--- 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
--- 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
--- a/src/V3Combine.cpp
+++ b/src/V3Combine.cpp
@ -40,7 +40,6 @@
 #include "V3Ast.h"

 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>

--- a/src/V3Const.cpp
+++ b/src/V3Const.cpp
@ -31,7 +31,6 @@
 #include "V3Simulate.h"

 #include <algorithm>
-#include <cstdarg>
 #include <map>

 //######################################################################
--- a/src/V3Coverage.cpp
+++ b/src/V3Coverage.cpp
@ -31,7 +31,6 @@
 #include "V3Coverage.h"
 #include "V3Ast.h"

-#include <cstdarg>
 #include <map>

 //######################################################################
--- a/src/V3CoverageJoin.cpp
+++ b/src/V3CoverageJoin.cpp
@ -25,7 +25,6 @@
 #include "V3Hashed.h"
 #include "V3Stats.h"

-#include <cstdarg>
 #include <vector>

 //######################################################################
--- a/src/V3Dead.cpp
+++ b/src/V3Dead.cpp
@ -41,7 +41,6 @@
 #include "V3Dead.h"
 #include "V3Ast.h"

-#include <cstdarg>
 #include <map>
 #include <vector>

--- a/src/V3Delayed.cpp
+++ b/src/V3Delayed.cpp
@ -57,7 +57,6 @@
 #include "V3Stats.h"

 #include <algorithm>
-#include <cstdarg>
 #include <deque>
 #include <map>

--- a/src/V3Depth.cpp
+++ b/src/V3Depth.cpp
@ -31,7 +31,6 @@
 #include "V3Ast.h"

 #include <algorithm>
-#include <cstdarg>

 //######################################################################

--- a/src/V3DepthBlock.cpp
+++ b/src/V3DepthBlock.cpp
@ -29,7 +29,6 @@
 #include "V3EmitCBase.h"

 #include <algorithm>
-#include <cstdarg>

 //######################################################################

--- a/src/V3Descope.cpp
+++ b/src/V3Descope.cpp
@ -30,7 +30,6 @@
 #include "V3Ast.h"
 #include "V3EmitCBase.h"

-#include <cstdarg>
 #include <map>

 //######################################################################
--- 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
--- 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>

 //######################################################################

--- 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>

 //######################################################################

--- 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>

 //######################################################################
--- 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>

--- 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>

--- a/src/V3Error.cpp
+++ b/src/V3Error.cpp
@ -23,8 +23,6 @@
 #endif
 // clang-format on

-#include <cstdarg>
-
 //======================================================================
 // Statics

--- 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
--- 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"

--- 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

--- 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;
--- 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

--- 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>
--- a/src/V3GraphAcyc.cpp
+++ b/src/V3GraphAcyc.cpp
@ -21,7 +21,6 @@
 #include "V3Graph.h"

 #include <algorithm>
-#include <cstdarg>
 #include <list>
 #include <vector>

--- 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>
--- 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>
--- a/src/V3GraphTest.cpp
+++ b/src/V3GraphTest.cpp
@ -21,8 +21,6 @@
 #include "V3Graph.h"
 #include "V3GraphDfa.h"

-#include <cstdarg>
-
 //######################################################################
 //######################################################################
 // Test class
--- 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>
--- 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

--- 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
--- a/src/V3Life.cpp
+++ b/src/V3Life.cpp
@ -32,7 +32,6 @@
 #include "V3Ast.h"
 #include "V3Const.h"

-#include <cstdarg>
 #include <map>
 #include <vector>

--- 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

--- 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
--- a/src/V3LinkDot.cpp
+++ b/src/V3LinkDot.cpp
@ -71,7 +71,6 @@
 #include "V3String.h"

 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>

--- a/src/V3LinkInc.cpp
+++ b/src/V3LinkInc.cpp
@ -44,8 +44,6 @@
 #include "V3Ast.h"

 #include <algorithm>
-#include <cstdarg>
-#include <vector>

 //######################################################################

--- a/src/V3LinkJump.cpp
+++ b/src/V3LinkJump.cpp
@ -37,7 +37,6 @@
 #include "V3Ast.h"

 #include <algorithm>
-#include <cstdarg>
 #include <vector>

 //######################################################################
--- 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
--- a/src/V3LinkLevel.cpp
+++ b/src/V3LinkLevel.cpp
@ -27,7 +27,6 @@
 #include "V3Ast.h"

 #include <algorithm>
-#include <cstdarg>
 #include <map>
 #include <vector>

--- 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>
--- 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
--- a/src/V3Localize.cpp
+++ b/src/V3Localize.cpp
@ -30,7 +30,6 @@
 #include "V3Stats.h"
 #include "V3Ast.h"

-#include <cstdarg>
 #include <vector>

 //######################################################################
--- 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

--- 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)

--- 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>
--- 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
--- 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>
--- a/src/V3ParseImp.cpp
+++ b/src/V3ParseImp.cpp
@ -34,8 +34,6 @@
 #include "V3PreShell.h"
 #include "V3LanguageWords.h"

-#include <cstdarg>
-#include <fstream>
 #include <sstream>

 //======================================================================
--- 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>

 //======================================================================
--- 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"
--- 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>
--- 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>

 //######################################################################

--- 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
--- 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"

--- 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

--- 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
--- a/src/V3Slice.cpp
+++ b/src/V3Slice.cpp
@ -42,8 +42,6 @@
 #include "V3Slice.h"
 #include "V3Ast.h"

-#include <cstdarg>
-
 //*************************************************************************

 class SliceVisitor : public AstNVisitor {
--- 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
--- 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>

 //######################################################################

--- 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"
--- 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>

--- 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
--- 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>

 //######################################################################
--- 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
--- a/src/V3Table.cpp
+++ b/src/V3Table.cpp
@ -31,7 +31,6 @@
 #include "V3Ast.h"

 #include <cmath>
-#include <cstdarg>
 #include <deque>

 //######################################################################
--- 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>

 //######################################################################
--- 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>

 //######################################################################
--- a/src/V3Undriven.cpp
+++ b/src/V3Undriven.cpp
@ -32,7 +32,6 @@
 #include "V3Ast.h"

 #include <algorithm>
-#include <cstdarg>
 #include <vector>

 //######################################################################
--- a/src/V3Unknown.cpp
+++ b/src/V3Unknown.cpp
@ -38,7 +38,6 @@
 #include "V3Stats.h"

 #include <algorithm>
-#include <cstdarg>

 //######################################################################

--- 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
--- 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,
--- 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_
--- 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

--- 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;

--- a/src/VlcTop.cpp
+++ b/src/VlcTop.cpp
@ -21,7 +21,6 @@

 #include <algorithm>
 #include <fstream>
-#include <sys/stat.h>

 //######################################################################

--- 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, ...);