Internals: Cleanup and standardize include order. No functional change intended.

include/verilated.cpp

@@ -25,7 +25,9 @@
 
 #define _VERILATED_CPP_
 
+#include "verilatedos.h"
 #include "verilated_imp.h"
+
 #include "verilated_config.h"
 
 #include <cctype>

include/verilated.h

@@ -36,14 +36,14 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+// <iostream> avoided to reduce compile time
+// <map> avoided and instead in verilated_heavy.h to reduce compile time
+// <string> avoided and instead in verilated_heavy.h to reduce compile time
 #ifdef VL_THREADED
 # include <atomic>
 # include <mutex>
 # include <thread>
 #endif
-// <iostream> avoided to reduce compile time
-// <map> avoided and instead in verilated_heavy.h to reduce compile time
-// <string> avoided and instead in verilated_heavy.h to reduce compile time
 
 //=============================================================================
 // Switches

include/verilated_dpi.cpp

@@ -24,6 +24,7 @@
 //=========================================================================
 
 #define _VERILATED_DPI_CPP_
+
 #include "verilatedos.h"
 #include "verilated_dpi.h"
 #include "verilated_imp.h"

include/verilated_dpi.h

@@ -28,8 +28,10 @@
 #ifndef _VERILATED_DPI_H_
 #define _VERILATED_DPI_H_ 1 ///< Header Guard
 
+#include "verilatedos.h"
 #include "verilated.h"  // Also presumably included by caller
 #include "verilated_sym_props.h"
+
 #include "svdpi.h"
 
 //===================================================================

include/verilated_fst_c.cpp

@@ -23,9 +23,10 @@
 #include "verilatedos.h"
 #include "verilated.h"
 #include "verilated_fst_c.h"
+
 // Include the GTKWave implementation directly
-#include "gtkwave/fstapi.c"
 #include "gtkwave/fastlz.c"
+#include "gtkwave/fstapi.c"
 #include "gtkwave/lz4.c"
 
 #include <algorithm>

include/verilated_fst_c.h

@@ -25,6 +25,7 @@
 
 #include "verilatedos.h"
 #include "verilated.h"
+
 #include "gtkwave/fstapi.h"
 
 #include <list>

include/verilated_imp.h

@@ -33,11 +33,9 @@
 #include "verilated_heavy.h"
 #include "verilated_syms.h"
 
-#include <map>
+#include <deque>
 #include <set>
 #include <vector>
-#include <deque>
-#include <string>
 #ifdef VL_THREADED
 # include <functional>
 # include <queue>

include/verilated_lxt2_c.cpp

@@ -23,6 +23,7 @@
 #include "verilatedos.h"
 #include "verilated.h"
 #include "verilated_lxt2_c.h"
+
 // Include the GTKWave implementation directly
 #include "gtkwave/lxt2_write.cpp"
 

include/verilated_lxt2_c.h

@@ -25,6 +25,7 @@
 
 #include "verilatedos.h"
 #include "verilated.h"
+
 #include "gtkwave/lxt2_write.h"
 
 #include <map>

include/verilated_sc.h

@@ -28,6 +28,7 @@
 #define _VERILATED_SC_H_ 1 ///< Header Guard
 
 #include "verilatedos.h"
+
 #include "systemc.h"
 
 //=============================================================================

include/verilated_sym_props.h

@@ -32,6 +32,8 @@
 #ifndef _VERILATED_SYM_PROPS_H_
 #define _VERILATED_SYM_PROPS_H_ 1 ///< Header Guard
 
+#include "verilatedos.h"
+
 //===========================================================================
 /// Verilator range
 /// Thread safety: Assume is constructed only with model, then any number of readers

include/verilated_syms.h

@@ -31,9 +31,10 @@
 #ifndef _VERILATED_SYMS_H_
 #define _VERILATED_SYMS_H_ 1 ///< Header Guard
 
+#include "verilatedos.h"
+#include "verilated_heavy.h"
 #include "verilated_sym_props.h"
 
-#include "verilated_heavy.h"
 #include <map>
 
 //======================================================================

include/verilated_threads.cpp

@@ -21,6 +21,7 @@
 
 #include "verilatedos.h"
 #include "verilated_threads.h"
+
 #include <cstdio>
 
 std::atomic<vluint64_t> VlNotification::s_yields;

include/verilated_threads.h

@@ -23,18 +23,15 @@
 #define _VERILATED_THREADS_H_
 
 #include "verilatedos.h"
+#include "verilated.h"  // for VerilatedMutex and clang annotations
 
-#include <atomic>
-#include <thread>
-#include <vector>
-#include <set>
 #include <sched.h>  // For sched_getcpu()
+#include <set>
+#include <vector>
 #if defined(__APPLE__)
 # include <cpuid.h>  // For __cpuid_count()
 #endif
 
-#include "verilated.h"  // for VerilatedMutex and clang annotations
-
 // VlMTaskVertex and VlThreadpool will work with multiple symbol table types.
 // Since the type is opaque to VlMTaskVertex and VlThreadPool, represent it
 // as a void* here.

include/verilated_unordered_set_map.h

@@ -39,7 +39,6 @@
 #ifndef _V3_UNORDERED_SET_MAP_H_
 #define _V3_UNORDERED_SET_MAP_H_
 
-#include "verilated_config.h"
 #include "verilatedos.h"
 
 #include <list>

include/verilated_vcd_c.h

@@ -26,9 +26,9 @@
 #include "verilatedos.h"
 #include "verilated.h"
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 class VerilatedVcd;
 class VerilatedVcdCallInfo;

include/verilated_vcd_sc.h

@@ -25,6 +25,7 @@
 #ifndef _VERILATED_VCD_SC_H_
 #define _VERILATED_VCD_SC_H_ 1
 
+#include "verilatedos.h"
 #include "verilated_sc.h"
 #include "verilated_vcd_c.h"
 

include/verilated_vpi.h

@@ -26,6 +26,7 @@
 #ifndef _VERILATED_VPI_H_
 #define _VERILATED_VPI_H_ 1 ///< Header Guard
 
+#include "verilatedos.h"
 #include "verilated.h"
 #include "verilated_syms.h"
 

include/verilatedos.h

@@ -202,11 +202,11 @@
 //=========================================================================
 // Basic integer types
 
-#ifdef VL_UINTS_DEFINED
+#if defined(__CYGWIN__)
-#elif defined(__CYGWIN__)
 
 # include <stdint.h>
 # include <sys/types.h>  // __WORDSIZE
+# include <unistd.h>  // ssize_t
 typedef unsigned char           uint8_t;	///< 8-bit unsigned type (backward compatibility)
 typedef unsigned short int      uint16_t;	///< 16-bit unsigned type (backward compatibility)
 typedef unsigned char           vluint8_t;	///< 8-bit unsigned type
@@ -249,10 +249,10 @@ typedef signed   __int32        ssize_t;        ///< signed size_t; returned fro
 
 #else // Linux or compliant Unix flavors, -m64
 
-# include <stdint.h>	// Linux and most flavors
-# include <unistd.h>	// Linux ssize_t
 # include <inttypes.h>	// Solaris
+# include <stdint.h>  // Linux and most flavors
 # include <sys/types.h>  // __WORDSIZE
+# include <unistd.h>  // ssize_t
 typedef uint8_t			vluint8_t;	///< 32-bit unsigned type
 typedef uint16_t		vluint16_t;	///< 32-bit unsigned type
 typedef int			vlsint32_t;	///< 32-bit signed type

src/V3Active.cpp

@@ -32,12 +32,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Active.h"
@@ -45,6 +39,7 @@
 #include "V3EmitCBase.h"
 #include "V3Const.h"
 #include "V3SenTree.h"  // for SenTreeSet
+
 #include VL_INCLUDE_UNORDERED_MAP
 
 //***** See below for main transformation engine

src/V3Active.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3ACTIVE_H_
 #define _V3ACTIVE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3ActiveTop.cpp

@@ -29,11 +29,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3ActiveTop.h"

src/V3ActiveTop.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3ACTIVETOP_H_
 #define _V3ACTIVETOP_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Assert.cpp

@@ -20,11 +20,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <iomanip>
-#include <map>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Assert.h"
@@ -32,6 +27,9 @@
 #include "V3GraphDfa.h"
 #include "V3Stats.h"
 
+#include <cstdarg>
+#include <iomanip>
+
 //######################################################################
 // Assert class functions
 

src/V3Assert.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3ASSERT_H_
 #define _V3ASSERT_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3AssertPre.cpp

@@ -23,15 +23,12 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <iomanip>
-#include <map>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3AssertPre.h"
-#include "V3Ast.h"
+
+#include <cstdarg>
+#include <iomanip>
 
 //######################################################################
 // Assert class functions

src/V3AssertPre.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3ASSERTPRE_H_
 #define _V3ASSERTPRE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Ast.cpp

@@ -18,11 +18,8 @@
 //
 //*************************************************************************
 
-#include <cstdarg>
+#include "config_build.h"
-#include <cstdio>
+#include "verilatedos.h"
-#include <fstream>
-#include <iomanip>
-#include <memory>
 
 #include "V3Ast.h"
 #include "V3File.h"
@@ -30,6 +27,10 @@
 #include "V3Broken.h"
 #include "V3String.h"
 
+#include <cstdarg>
+#include <iomanip>
+#include <memory>
+
 //======================================================================
 // Statics
 

src/V3Ast.h

@@ -20,15 +20,16 @@
 
 #ifndef _V3AST_H_
 #define _V3AST_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3FileLine.h"
 #include "V3Number.h"
 #include "V3Global.h"
+
 #include <cmath>
-#include <map>
-#include <vector>
 #include VL_INCLUDE_UNORDERED_SET
 
 #include "V3Ast__gen_classes.h"	// From ./astgen

src/V3AstNodes.cpp

@@ -20,13 +20,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <fstream>
-#include <iomanip>
-#include <vector>
-#include VL_INCLUDE_UNORDERED_SET
 
 #include "V3Ast.h"
 #include "V3File.h"
@@ -34,6 +27,10 @@
 #include "V3Graph.h"
 #include "V3PartitionGraph.h"  // Just for mtask dumping
 
+#include <cstdarg>
+#include <iomanip>
+#include <vector>
+
 //======================================================================
 // Special methods
 

src/V3Begin.cpp

@@ -31,17 +31,16 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Begin.h"
 #include "V3Inst.h"
 #include "V3Ast.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include <vector>
+
 //######################################################################
 
 class BeginState {

src/V3Begin.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3BEGIN_H_
 #define _V3BEGIN_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Branch.cpp

@@ -29,15 +29,14 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Branch.h"
 #include "V3Ast.h"
 
+#include <cstdarg>
+#include <map>
+
 //######################################################################
 // Branch state, as a visitor of each AstNode
 

src/V3Branch.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3BRANCH_H_
 #define _V3BRANCH_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Broken.cpp

@@ -27,11 +27,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
-#include VL_INCLUDE_UNORDERED_MAP
 
 #include "V3Global.h"
 #include "V3Broken.h"
@@ -40,6 +35,10 @@
 // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators
 #include "V3AstConstOnly.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include VL_INCLUDE_UNORDERED_MAP
+
 //######################################################################
 
 class BrokenTable : public AstNVisitor {

src/V3Broken.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3BROKEN_H_
 #define _V3BROKEN_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3CCtors.cpp

@@ -27,20 +27,20 @@
 //
 //	This transformation honors outputSplitCFuncs.
 //*************************************************************************
+
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3EmitCBase.h"
 #include "V3CCtors.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 class V3CCtorsVisitor {
 private:
     string 		m_basename;

src/V3CCtors.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CCTORS_H_
 #define _V3CCTORS_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Case.cpp

@@ -39,16 +39,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Case.h"
 #include "V3Ast.h"
 #include "V3Stats.h"
 
+#include <algorithm>
+#include <cstdarg>
+
 #define CASE_OVERLAP_WIDTH 12		// Maximum width we can check for overlaps in
 #define CASE_BARF	   999999	// Magic width when non-constant
 #define CASE_ENCODER_GROUP_DEPTH 8	// Levels of priority to be ORed together in top IF tree

src/V3Case.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CASE_H_
 #define _V3CASE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Cast.cpp

@@ -43,15 +43,14 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Cast.h"
 #include "V3Ast.h"
 
+#include <algorithm>
+#include <cstdarg>
+
 //######################################################################
 // Cast state, as a visitor of each AstNode
 

src/V3Cast.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CAST_H_
 #define _V3CAST_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Cdc.cpp

@@ -27,15 +27,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <deque>
-#include <iomanip>
-#include <list>
-#include <memory>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Cdc.h"
@@ -45,6 +36,14 @@
 #include "V3EmitV.h"
 #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
 
 //######################################################################

src/V3Cdc.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CDC_H_
 #define _V3CDC_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Changed.cpp

@@ -32,17 +32,16 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <set>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Ast.h"
 #include "V3Changed.h"
 #include "V3EmitCBase.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include <set>
+
 //######################################################################
 
 class ChangedState {

src/V3Changed.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CHANGED_H_
 #define _V3CHANGED_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Clean.cpp

@@ -29,15 +29,14 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Clean.h"
 #include "V3Ast.h"
 
+#include <algorithm>
+#include <cstdarg>
+
 //######################################################################
 // Clean state, as a visitor of each AstNode
 

src/V3Clean.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CLEAN_H_
 #define _V3CLEAN_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3ClkGater.cpp

@@ -33,12 +33,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Ast.h"
@@ -46,6 +40,11 @@
 #include "V3Graph.h"
 #include "V3ClkGater.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 //######################################################################
 // Base for debug
 

src/V3ClkGater.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CLKGATER_H_
 #define _V3CLKGATER_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Clock.cpp

@@ -33,16 +33,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Clock.h"
 #include "V3Ast.h"
 #include "V3EmitCBase.h"
 
+#include <algorithm>
+#include <cstdarg>
+
 //######################################################################
 // Clock state, as a visitor of each AstNode
 

src/V3Clock.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CLOCK_H_
 #define _V3CLOCK_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Combine.cpp

@@ -36,12 +36,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Combine.h"
@@ -49,6 +43,11 @@
 #include "V3Stats.h"
 #include "V3Ast.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 //######################################################################
 
 #define COMBINE_MIN_STATEMENTS 50	// Min # of statements to be worth making a function

src/V3Combine.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3COMBINE_H_
 #define _V3COMBINE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Config.cpp

@@ -20,14 +20,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <map>
-#include <set>
-#include <string>
 
 #include "V3Global.h"
 #include "V3String.h"
 #include "V3Config.h"
 
+#include <map>
+#include <set>
+#include <string>
+
 //######################################################################
 
 class V3ConfigLine {

src/V3Config.h

@@ -20,9 +20,10 @@
 
 #ifndef _V3CONFIG_H_
 #define _V3CONFIG_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
-#include <string>
+
 #include "V3Error.h"
 #include "V3FileLine.h"
 

src/V3Const.cpp

@@ -26,11 +26,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3String.h"
@@ -39,6 +34,10 @@
 #include "V3Width.h"
 #include "V3Simulate.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include <map>
+
 //######################################################################
 // Utilities
 

src/V3Const.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3CONST_H_
 #define _V3CONST_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Coverage.cpp

@@ -30,15 +30,14 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Coverage.h"
 #include "V3Ast.h"
 
+#include <cstdarg>
+#include <map>
+
 //######################################################################
 // Coverage state, as a visitor of each AstNode
 

src/V3Coverage.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3COVERAGE_H_
 #define _V3COVERAGE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3CoverageJoin.cpp

@@ -24,16 +24,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3CoverageJoin.h"
 #include "V3Hashed.h"
 #include "V3Stats.h"
 
+#include <cstdarg>
+#include <vector>
+
 //######################################################################
 // CoverageJoin state, as a visitor of each AstNode
 

src/V3CoverageJoin.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3COVERAGEJOIN_H_
 #define _V3COVERAGEJOIN_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Dead.cpp

@@ -40,16 +40,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Dead.h"
 #include "V3Ast.h"
 
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 //######################################################################
 
 class DeadModVisitor : public AstNVisitor {

src/V3Dead.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3DEAD_H_
 #define _V3DEAD_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Delayed.cpp

@@ -53,18 +53,17 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <deque>
-#include <map>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Delayed.h"
 #include "V3Ast.h"
 #include "V3Stats.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include <deque>
+#include <map>
+
 //######################################################################
 // Delayed state, as a visitor of each AstNode
 

src/V3Delayed.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3DELAYED_H_
 #define _V3DELAYED_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Depth.cpp

@@ -29,15 +29,14 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Depth.h"
 #include "V3Ast.h"
 
+#include <algorithm>
+#include <cstdarg>
+
 //######################################################################
 
 class DepthVisitor : public AstNVisitor {

src/V3Depth.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3DEPTH_H_
 #define _V3DEPTH_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3DepthBlock.cpp

@@ -26,16 +26,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3DepthBlock.h"
 #include "V3Ast.h"
 #include "V3EmitCBase.h"
 
+#include <algorithm>
+#include <cstdarg>
+
 //######################################################################
 
 class DepthBlockVisitor : public AstNVisitor {

src/V3DepthBlock.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3DEPTHBLOCK_H_
 #define _V3DEPTHBLOCK_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Descope.cpp

@@ -28,16 +28,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Descope.h"
 #include "V3Ast.h"
 #include "V3EmitCBase.h"
 
+#include <cstdarg>
+#include <map>
+
 //######################################################################
 
 class DescopeVisitor : public AstNVisitor {

src/V3Descope.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3DESCOPE_H_
 #define _V3DESCOPE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3EmitC.cpp

@@ -20,14 +20,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
-#include VL_INCLUDE_UNORDERED_SET
 
 #include "V3Global.h"
 #include "V3String.h"
@@ -37,6 +29,13 @@
 #include "V3PartitionGraph.h"
 #include "V3TSP.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstdarg>
+#include <map>
+#include <vector>
+#include VL_INCLUDE_UNORDERED_SET
+
 #define VL_VALUE_STRING_MAX_WIDTH 8192	// We use a static char array in VL_VALUE_STRING
 
 #define EMITC_NUM_CONSTW	8	// Number of VL_CONST_W_*X's in verilated.h (IE VL_CONST_W_8X is last)

src/V3EmitC.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3EMITC_H_
 #define _V3EMITC_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3EmitCBase.h

@@ -23,15 +23,14 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdio>
-#include <cstdarg>
-#include <unistd.h>
-#include <cmath>
 
 #include "V3Global.h"
 #include "V3File.h"
 #include "V3Ast.h"
 
+#include <cstdarg>
+#include <cmath>
+
 //######################################################################
 // Base Visitor class -- holds output file pointer
 

src/V3EmitCInlines.cpp

@@ -20,18 +20,17 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3EmitC.h"
 #include "V3EmitCBase.h"
 #include "V3Stats.h"
 
+#include <cmath>
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 //######################################################################
 
 class EmitCInlines : EmitCBaseVisitor {

src/V3EmitCSyms.cpp

@@ -20,20 +20,19 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <set>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3EmitC.h"
 #include "V3EmitCBase.h"
 #include "V3LanguageWords.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstdarg>
+#include <map>
+#include <set>
+#include <vector>
+
 //######################################################################
 // Symbol table emitting
 

src/V3EmitMk.cpp

@@ -20,19 +20,18 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Os.h"
 #include "V3EmitMk.h"
 #include "V3EmitCBase.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 //######################################################################
 // Emit statements and math operators
 

src/V3EmitMk.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3EMITMK_H_
 #define _V3EMITMK_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3EmitV.cpp

@@ -20,18 +20,17 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3EmitV.h"
 #include "V3EmitCBase.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 //######################################################################
 // Emit statements and math operators
 

src/V3EmitV.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3EMITV_H_
 #define _V3EMITV_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3EmitXml.cpp

@@ -20,19 +20,18 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3String.h"
 #include "V3EmitXml.h"
 #include "V3EmitCBase.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstdarg>
+#include <map>
+#include <vector>
+
 //######################################################################
 // Emit statements and math operators
 

src/V3EmitXml.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3EMITXML_H_
 #define _V3EMITXML_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Error.cpp

@@ -18,10 +18,6 @@
 //
 //*************************************************************************
 
-#include <cstdarg>
-#include <cstdio>
-#include <cstring>
-#include <set>
 #include "V3Error.h"
 #ifndef _V3ERROR_NO_GLOBAL_
 # include "V3Ast.h"
@@ -29,6 +25,8 @@
 # include "V3Stats.h"
 #endif
 
+#include <cstdarg>
+
 //======================================================================
 // Statics
 

src/V3Error.h

@@ -20,16 +20,16 @@
 
 #ifndef _V3ERROR_H_
 #define _V3ERROR_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
-#include <string>
+
-#include <iostream>
-#include <sstream>
 #include <bitset>
+#include <cassert>
+#include <deque>
 #include <map>
 #include <set>
-#include <deque>
+#include <sstream>
-#include <cassert>
 
 //######################################################################
 

src/V3Expand.cpp

@@ -31,15 +31,14 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3Expand.h"
 #include "V3Ast.h"
 
+#include <algorithm>
+#include <cstdarg>
+
 //######################################################################
 // Expand state, as a visitor of each AstNode
 

src/V3Expand.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3EXPAND_H_
 #define _V3EXPAND_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3File.cpp

@@ -20,6 +20,13 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
+
+#include "V3Global.h"
+#include "V3File.h"
+#include "V3Os.h"
+#include "V3PreShell.h"
+#include "V3Ast.h"
+
 #include <cerrno>
 #include <cstdarg>
 #include <fcntl.h>
@@ -28,7 +35,6 @@
 #include <memory>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 # define INFILTER_PIPE  // Allow pipe filtering.  Needs fork()
@@ -46,12 +52,6 @@
 # include <sys/wait.h>
 #endif
 
-#include "V3Global.h"
-#include "V3File.h"
-#include "V3Os.h"
-#include "V3PreShell.h"
-#include "V3Ast.h"
-
 // If change this code, run a test with the below size set very small
 //#define INFILTER_IPC_BUFSIZ 16
 #define INFILTER_IPC_BUFSIZ 64*1024  // For debug, try this as a small number

src/V3File.h

@@ -20,10 +20,12 @@
 
 #ifndef _V3FILE_H_
 #define _V3FILE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
-#include <cstdio>
+
 #include <stack>
 #include <set>
 #include <list>

src/V3FileLine.cpp

@@ -20,10 +20,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <cstring>
-#include VL_INCLUDE_UNORDERED_SET
 
 #include "V3Error.h"
 #include "V3FileLine.h"
@@ -34,6 +30,9 @@
 # include "V3Config.h"
 #endif
 
+#include <cstdarg>
+#include VL_INCLUDE_UNORDERED_SET
+
 //######################################################################
 // FileLineSingleton class functions
 

src/V3FileLine.h

@@ -20,19 +20,19 @@
 
 #ifndef _V3FileLine_H_
 #define _V3FileLine_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
-#include <string>
+
-#include <iostream>
+#include "V3Error.h"
+#include "V3LangCode.h"
+
 #include <sstream>
 #include <bitset>
 #include <map>
 #include <set>
 #include <deque>
 
-#include "V3Error.h"
-#include "V3LangCode.h"
-
 //######################################################################
 
 class FileLine;

src/V3Gate.cpp

@@ -27,15 +27,6 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <iomanip>
-#include <list>
-#include <map>
-#include <unistd.h>
-#include <vector>
-#include VL_INCLUDE_UNORDERED_SET
 
 #include "V3Global.h"
 #include "V3Gate.h"
@@ -45,6 +36,14 @@
 #include "V3Stats.h"
 #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;
 
 #define GATE_DEDUP_MAX_DEPTH  20

src/V3Gate.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3GATE_H_
 #define _V3GATE_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3GenClk.cpp

@@ -25,14 +25,13 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdarg>
-#include <cstdio>
-#include <unistd.h>
 
 #include "V3Global.h"
 #include "V3GenClk.h"
 #include "V3Ast.h"
 
+#include <cstdarg>
+
 //######################################################################
 // GenClk state, as a visitor of each AstNode
 

src/V3GenClk.h

@@ -20,8 +20,10 @@
 
 #ifndef _V3GENCLK_H_
 #define _V3GENCLK_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3Ast.h"
 

src/V3Global.h

@@ -27,12 +27,13 @@
 #endif
 
 #include "verilatedos.h"
-#include <string>
 
 #include "V3Error.h"
 #include "V3FileLine.h"
 #include "V3Options.h"
 
+#include <string>
+
 class AstNetlist;
 
 //======================================================================

src/V3Graph.cpp

@@ -20,18 +20,16 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <map>
-#include <memory>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3File.h"
 #include "V3Graph.h"
 
+#include <cstdarg>
+#include <map>
+#include <memory>
+#include <vector>
+
 int V3Graph::s_debug = 0;
 int V3Graph::debug() { return std::max(V3Error::debugDefault(), s_debug); }
 

src/V3Graph.h

@@ -20,11 +20,13 @@
 
 #ifndef _V3GRAPH_H_
 #define _V3GRAPH_H_ 1
+
 #include "config_build.h"
 #include "verilatedos.h"
+
 #include "V3Error.h"
 #include "V3List.h"
-#include <vector>
+
 #include <algorithm>
 
 class FileLine;

src/V3GraphAcyc.cpp

@@ -20,16 +20,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <algorithm>
-#include <cstdarg>
-#include <cstdio>
-#include <list>
-#include <unistd.h>
-#include <vector>
 
 #include "V3Global.h"
 #include "V3Graph.h"
 
+#include <algorithm>
+#include <cstdarg>
+#include <list>
+#include <vector>
+
 //######################################################################
 //######################################################################
 // Algorithms - acyclic

src/V3GraphAlg.cpp

@@ -20,18 +20,17 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
-#include <cstdio>
-#include <cstdarg>
-#include <unistd.h>
-#include <algorithm>
-#include <vector>
-#include <map>
-#include <list>
 
 #include "V3Global.h"
 #include "V3GraphAlg.h"
 #include "V3GraphPathChecker.h"
 
+#include <cstdarg>
+#include <algorithm>
+#include <vector>
+#include <map>
+#include <list>
+
 //######################################################################
 //######################################################################
 // Algorithms - delete