diff --git a/.clang-format b/.clang-format
index 251eebe52..b41d0c25a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -17,7 +17,7 @@ AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
+AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:
@@ -59,15 +59,27 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-IncludeBlocks:   Preserve
+
+# Include grouping/sorting
+SortIncludes:    true
+IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IncludeIsMainRegex: '(Test)?$'
+  - Regex:           '"(config_build|verilated_config|verilatedos)\.h"'
+    Priority:        -1 # Sepecials before main header
+  - Regex:           '(<|")verilated.*'
+    Priority:        1 # Runtime headers
+  - Regex:           '"V3.*__gen.*\.h"'
+    Priority:        3 # Generated internal headers separately
+  - Regex:           '"V3.*"'
+    Priority:        2 # Internal header
+  - Regex:           '".*"'
+    Priority:        4 # Other non-system headers
+  - Regex:           '<[[:alnum:]_.]+>'
+    Priority:        5 # Simple system headers next
+  - Regex:           '<.*>'
+    Priority:        6 # Other system headers next
+IncludeIsMainRegex: '$'
+
 IndentCaseLabels: false
 IndentPPDirectives: None
 IndentWidth:     4
@@ -91,7 +103,6 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
 ReflowComments:  true
-SortIncludes:    false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
diff --git a/include/verilated.cpp b/include/verilated.cpp
index 90b5f46c9..ee5090507 100644
--- a/include/verilated.cpp
+++ b/include/verilated.cpp
@@ -47,21 +47,22 @@
 
 #define VERILATOR_VERILATED_CPP_
 
-#include "verilatedos.h"
-#include "verilated_imp.h"
-
 #include "verilated_config.h"
+#include "verilatedos.h"
+
+#include "verilated_imp.h"
 
 #include <algorithm>
 #include <cctype>
 #include <cerrno>
 #include <cstdlib>
-#include <sstream>
-#include <sys/stat.h>  // mkdir
-#include <list>
 #include <limits>
+#include <list>
+#include <sstream>
 #include <utility>
 
+#include <sys/stat.h>  // mkdir
+
 // clang-format off
 #if defined(_WIN32) || defined(__MINGW32__)
 # include <direct.h>  // mkdir
diff --git a/include/verilated.h b/include/verilated.h
index bed666c7d..5700e67be 100644
--- a/include/verilated.h
+++ b/include/verilated.h
@@ -91,7 +91,8 @@ class VerilatedFstC;
 class VerilatedFstSc;
 class VerilatedScope;
 class VerilatedScopeNameMap;
-template <class, class> class VerilatedTrace;
+template <class, class>
+class VerilatedTrace;
 class VerilatedTraceConfig;
 class VerilatedVar;
 class VerilatedVarNameMap;
@@ -283,7 +284,8 @@ public:
 
 private:
     // The following are for use by Verilator internals only
-    template <class, class> friend class VerilatedTrace;
+    template <class, class>
+    friend class VerilatedTrace;
     // Run-time trace configuration requested by this model
     virtual std::unique_ptr<VerilatedTraceConfig> traceConfig() const;
 };
diff --git a/include/verilated_cov.cpp b/include/verilated_cov.cpp
index 6c0f72340..3932afef6 100644
--- a/include/verilated_cov.cpp
+++ b/include/verilated_cov.cpp
@@ -22,8 +22,10 @@
 //=============================================================================
 
 #include "verilatedos.h"
-#include "verilated.h"
+
 #include "verilated_cov.h"
+
+#include "verilated.h"
 #include "verilated_cov_key.h"
 
 #include <deque>
@@ -69,7 +71,8 @@ public:  // But only local to this file
 // This isn't in the header file for auto-magic conversion because it
 // inlines to too much code and makes compilation too slow.
 
-template <class T> class VerilatedCoverItemSpec final : public VerilatedCovImpItem {
+template <class T>
+class VerilatedCoverItemSpec final : public VerilatedCovImpItem {
 private:
     // MEMBERS
     T* m_countp;  // Count value
diff --git a/include/verilated_cov.h b/include/verilated_cov.h
index d110e91c3..4c3b1550d 100644
--- a/include/verilated_cov.h
+++ b/include/verilated_cov.h
@@ -26,6 +26,7 @@
 #define VERILATOR_VERILATED_COV_H_
 
 #include "verilatedos.h"
+
 #include "verilated.h"
 
 #include <iostream>
@@ -88,7 +89,8 @@ class VerilatedCovImp;
 //=============================================================================
 // Convert VL_COVER_INSERT value arguments to strings, is \internal
 
-template <class T> std::string vlCovCvtToStr(const T& t) VL_PURE {
+template <class T>
+std::string vlCovCvtToStr(const T& t) VL_PURE {
     std::ostringstream os;
     os << t;
     return os.str();
diff --git a/include/verilated_dpi.cpp b/include/verilated_dpi.cpp
index 0eefa6e5b..caa72af85 100644
--- a/include/verilated_dpi.cpp
+++ b/include/verilated_dpi.cpp
@@ -28,7 +28,9 @@
 #define VERILATOR_VERILATED_DPI_CPP_
 
 #include "verilatedos.h"
+
 #include "verilated_dpi.h"
+
 #include "verilated_imp.h"
 
 // On MSVC++ we need svdpi.h to declare exports, not imports
diff --git a/include/verilated_dpi.h b/include/verilated_dpi.h
index f37679f91..31989b0b5 100644
--- a/include/verilated_dpi.h
+++ b/include/verilated_dpi.h
@@ -27,6 +27,7 @@
 #define VERILATOR_VERILATED_DPI_H_
 
 #include "verilatedos.h"
+
 #include "verilated.h"  // Also presumably included by caller
 #include "verilated_sym_props.h"
 
diff --git a/include/verilated_fst_c.h b/include/verilated_fst_c.h
index b41b5a92c..73c821a60 100644
--- a/include/verilated_fst_c.h
+++ b/include/verilated_fst_c.h
@@ -118,12 +118,18 @@ public:
 
 #ifndef DOXYGEN
 // Declare specialization here as it's used in VerilatedFstC just below
-template <> void VerilatedFst::Super::dump(uint64_t time);
-template <> void VerilatedFst::Super::set_time_unit(const char* unitp);
-template <> void VerilatedFst::Super::set_time_unit(const std::string& unit);
-template <> void VerilatedFst::Super::set_time_resolution(const char* unitp);
-template <> void VerilatedFst::Super::set_time_resolution(const std::string& unit);
-template <> void VerilatedFst::Super::dumpvars(int level, const std::string& hier);
+template <>
+void VerilatedFst::Super::dump(uint64_t time);
+template <>
+void VerilatedFst::Super::set_time_unit(const char* unitp);
+template <>
+void VerilatedFst::Super::set_time_unit(const std::string& unit);
+template <>
+void VerilatedFst::Super::set_time_resolution(const char* unitp);
+template <>
+void VerilatedFst::Super::set_time_resolution(const std::string& unit);
+template <>
+void VerilatedFst::Super::dumpvars(int level, const std::string& hier);
 #endif
 
 //=============================================================================
diff --git a/include/verilated_fst_sc.cpp b/include/verilated_fst_sc.cpp
index 084546435..2acb38781 100644
--- a/include/verilated_fst_sc.cpp
+++ b/include/verilated_fst_sc.cpp
@@ -22,6 +22,7 @@
 //=============================================================================
 
 #include "verilatedos.h"
+
 #include "verilated_fst_sc.h"
 
 //======================================================================
diff --git a/include/verilated_fst_sc.h b/include/verilated_fst_sc.h
index 9c7c07c4c..ae0943d8b 100644
--- a/include/verilated_fst_sc.h
+++ b/include/verilated_fst_sc.h
@@ -23,8 +23,9 @@
 #define _VERILATED_FST_SC_H_ 1
 
 #include "verilatedos.h"
-#include "verilated_sc.h"
+
 #include "verilated_fst_c.h"
+#include "verilated_sc.h"
 
 #include <string>
 
diff --git a/include/verilated_profiler.cpp b/include/verilated_profiler.cpp
index d65442f44..b04cc34e3 100644
--- a/include/verilated_profiler.cpp
+++ b/include/verilated_profiler.cpp
@@ -17,6 +17,7 @@
 //=============================================================================
 
 #include "verilatedos.h"
+
 #include "verilated_profiler.h"
 
 #if VL_THREADED
@@ -60,7 +61,8 @@ uint16_t VlExecutionRecord::getcpu() {
 //=============================================================================
 // VlExecutionProfiler implementation
 
-template <size_t N> static size_t roundUptoMultipleOf(size_t value) {
+template <size_t N>
+static size_t roundUptoMultipleOf(size_t value) {
     static_assert((N & (N - 1)) == 0, "'N' must be a power of 2");
     size_t mask = N - 1;
     return (value + mask) & ~mask;
diff --git a/include/verilated_profiler.h b/include/verilated_profiler.h
index dcb906b45..a237ee5cf 100644
--- a/include/verilated_profiler.h
+++ b/include/verilated_profiler.h
@@ -23,6 +23,7 @@
 #define VERILATOR_VERILATED_PROFILER_H_
 
 #include "verilatedos.h"
+
 #include "verilated.h"
 
 #include <array>
@@ -192,7 +193,8 @@ public:
 //=============================================================================
 // VlPgoProfiler is for collecting profiling data for PGO
 
-template <std::size_t T_Entries> class VlPgoProfiler final {
+template <std::size_t T_Entries>
+class VlPgoProfiler final {
     // TYPES
     struct Record final {
         const std::string m_name;  // Hashed name of mtask/etc
diff --git a/include/verilated_save.cpp b/include/verilated_save.cpp
index 20d4014ad..f2c80363d 100644
--- a/include/verilated_save.cpp
+++ b/include/verilated_save.cpp
@@ -24,8 +24,10 @@
 #define VERILATOR_VERILATED_SAVE_CPP_
 
 #include "verilatedos.h"
-#include "verilated.h"
+
 #include "verilated_save.h"
+
+#include "verilated.h"
 #include "verilated_imp.h"
 
 #include <cerrno>
diff --git a/include/verilated_save.h b/include/verilated_save.h
index 728c2aead..71d01fa49 100644
--- a/include/verilated_save.h
+++ b/include/verilated_save.h
@@ -23,6 +23,7 @@
 #define VERILATOR_VERILATED_SAVE_C_H_
 
 #include "verilatedos.h"
+
 #include "verilated.h"
 
 #include <string>
diff --git a/include/verilated_syms.h b/include/verilated_syms.h
index 72243c268..b2ca74849 100644
--- a/include/verilated_syms.h
+++ b/include/verilated_syms.h
@@ -30,6 +30,7 @@
 #define VERILATOR_VERILATED_SYMS_H_
 
 #include "verilatedos.h"
+
 #include "verilated.h"
 #include "verilated_sym_props.h"
 
diff --git a/include/verilated_threads.cpp b/include/verilated_threads.cpp
index 6696d738d..9d6bdedc9 100644
--- a/include/verilated_threads.cpp
+++ b/include/verilated_threads.cpp
@@ -22,6 +22,7 @@
 //=============================================================================
 
 #include "verilatedos.h"
+
 #include "verilated_threads.h"
 
 #include <cstdio>
diff --git a/include/verilated_threads.h b/include/verilated_threads.h
index 5a0e35b9d..59658bf20 100644
--- a/include/verilated_threads.h
+++ b/include/verilated_threads.h
@@ -24,6 +24,7 @@
 #define VERILATOR_VERILATED_THREADS_H_
 
 #include "verilatedos.h"
+
 #include "verilated.h"  // for VerilatedMutex and clang annotations
 
 #ifndef VL_THREADED
@@ -169,7 +170,7 @@ public:
     ~VlWorkerThread();
 
     // METHODS
-    template <bool SpinWait>  //
+    template <bool SpinWait>
     inline void dequeWork(ExecRec* workp) VL_MT_SAFE_EXCLUDES(m_mutex) {
         // Spin for a while, waiting for new data
         if VL_CONSTEXPR_CXX17 (SpinWait) {
diff --git a/include/verilated_trace.h b/include/verilated_trace.h
index a66166363..03ca2ba2c 100644
--- a/include/verilated_trace.h
+++ b/include/verilated_trace.h
@@ -43,15 +43,18 @@
 // clang-format on
 
 class VlThreadPool;
-template <class T_Buffer> class VerilatedTraceBuffer;
-template <class T_Buffer> class VerilatedTraceOffloadBuffer;
+template <class T_Buffer>
+class VerilatedTraceBuffer;
+template <class T_Buffer>
+class VerilatedTraceOffloadBuffer;
 
 #ifdef VL_THREADED
 //=============================================================================
 // Offloaded tracing
 
 // A simple synchronized first in first out queue
-template <class T> class VerilatedThreadQueue final {  // LCOV_EXCL_LINE  // lcov bug
+template <class T>
+class VerilatedThreadQueue final {  // LCOV_EXCL_LINE  // lcov bug
 private:
     mutable VerilatedMutex m_mutex;  // Protects m_queue
     std::condition_variable_any m_cv;
@@ -137,7 +140,8 @@ public:
 
 // T_Trace is the format specific subclass of VerilatedTrace.
 // T_Buffer is the format specific base class of VerilatedTraceBuffer.
-template <class T_Trace, class T_Buffer> class VerilatedTrace VL_NOT_FINAL {
+template <class T_Trace, class T_Buffer>
+class VerilatedTrace VL_NOT_FINAL {
 public:
     using Buffer = VerilatedTraceBuffer<T_Buffer>;
     using OffloadBuffer = VerilatedTraceOffloadBuffer<T_Buffer>;
@@ -384,7 +388,7 @@ public:
 
 // T_Buffer is the format specific base class of VerilatedTraceBuffer.
 // The format-specific hot-path methods use duck-typing via T_Buffer for performance.
-template <class T_Buffer>  //
+template <class T_Buffer>
 class VerilatedTraceBuffer VL_NOT_FINAL : public T_Buffer {
 protected:
     // Type of the owner trace file
@@ -477,7 +481,7 @@ public:
 
 // T_Buffer is the format specific base class of VerilatedTraceBuffer.
 // The format-specific hot-path methods use duck-typing via T_Buffer for performance.
-template <class T_Buffer>  //
+template <class T_Buffer>
 class VerilatedTraceOffloadBuffer final : public VerilatedTraceBuffer<T_Buffer> {
     using typename VerilatedTraceBuffer<T_Buffer>::Trace;
 
diff --git a/include/verilated_trace_imp.h b/include/verilated_trace_imp.h
index 1401f67eb..0663986f1 100644
--- a/include/verilated_trace_imp.h
+++ b/include/verilated_trace_imp.h
@@ -82,7 +82,8 @@ static std::string doubleToTimescale(double value) {
 //=========================================================================
 // Buffer management
 
-template <> uint32_t* VerilatedTrace<VL_SUB_T, VL_BUF_T>::getOffloadBuffer() {
+template <>
+uint32_t* VerilatedTrace<VL_SUB_T, VL_BUF_T>::getOffloadBuffer() {
     uint32_t* bufferp;
     // Some jitter is expected, so some number of alternative offlaod buffers are
     // required, but don't allocate more than 8 buffers.
@@ -101,7 +102,8 @@ template <> uint32_t* VerilatedTrace<VL_SUB_T, VL_BUF_T>::getOffloadBuffer() {
     return bufferp;
 }
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::waitForOffloadBuffer(const uint32_t* buffp) {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::waitForOffloadBuffer(const uint32_t* buffp) {
     // Slow path code only called on flush/shutdown, so use a simple algorithm.
     // Collect buffers from worker and stash them until we get the one we want.
     std::deque<uint32_t*> stash;
@@ -116,7 +118,8 @@ template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::waitForOffloadBuffer(const
 //=========================================================================
 // Worker thread
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::offloadWorkerThreadMain() {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::offloadWorkerThreadMain() {
     bool shutdown = false;
 
     do {
@@ -231,7 +234,8 @@ template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::offloadWorkerThreadMain() {
     } while (VL_LIKELY(!shutdown));
 }
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::shutdownOffloadWorker() {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::shutdownOffloadWorker() {
     // If the worker thread is not running, done..
     if (!m_workerThread) return;
 
@@ -251,7 +255,8 @@ template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::shutdownOffloadWorker() {
 //=============================================================================
 // Life cycle
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::closeBase() {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::closeBase() {
 #ifdef VL_THREADED
     if (offload()) {
         shutdownOffloadWorker();
@@ -263,7 +268,8 @@ template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::closeBase() {
 #endif
 }
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::flushBase() {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::flushBase() {
 #ifdef VL_THREADED
     if (offload()) {
         // Hand an empty buffer to the worker thread
@@ -280,12 +286,14 @@ template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::flushBase() {
 //=============================================================================
 // Callbacks to run on global events
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::onFlush(void* selfp) {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::onFlush(void* selfp) {
     // This calls 'flush' on the derived class (which must then get any mutex)
     reinterpret_cast<VL_SUB_T*>(selfp)->flush();
 }
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::onExit(void* selfp) {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::onExit(void* selfp) {
     // This calls 'close' on the derived class (which must then get any mutex)
     reinterpret_cast<VL_SUB_T*>(selfp)->close();
 }
@@ -293,12 +301,14 @@ template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::onExit(void* selfp) {
 //=============================================================================
 // VerilatedTrace
 
-template <> VerilatedTrace<VL_SUB_T, VL_BUF_T>::VerilatedTrace() {
+template <>
+VerilatedTrace<VL_SUB_T, VL_BUF_T>::VerilatedTrace() {
     set_time_unit(Verilated::threadContextp()->timeunitString());
     set_time_resolution(Verilated::threadContextp()->timeprecisionString());
 }
 
-template <> VerilatedTrace<VL_SUB_T, VL_BUF_T>::~VerilatedTrace() {
+template <>
+VerilatedTrace<VL_SUB_T, VL_BUF_T>::~VerilatedTrace() {
     if (m_sigs_oldvalp) VL_DO_CLEAR(delete[] m_sigs_oldvalp, m_sigs_oldvalp = nullptr);
     if (m_sigs_enabledp) VL_DO_CLEAR(delete[] m_sigs_enabledp, m_sigs_enabledp = nullptr);
     Verilated::removeFlushCb(VerilatedTrace<VL_SUB_T, VL_BUF_T>::onFlush, this);
@@ -309,7 +319,8 @@ template <> VerilatedTrace<VL_SUB_T, VL_BUF_T>::~VerilatedTrace() {
 //=========================================================================
 // Internals available to format specific implementations
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::traceInit() VL_MT_UNSAFE {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::traceInit() VL_MT_UNSAFE {
     // Note: It is possible to re-open a trace file (VCD in particular),
     // so we must reset the next code here, but it must have the same number
     // of codes on re-open
@@ -419,14 +430,16 @@ bool VerilatedTrace<VL_SUB_T, VL_BUF_T>::declCode(uint32_t code, const char* nam
 //=========================================================================
 // Internals available to format specific implementations
 
-template <> std::string VerilatedTrace<VL_SUB_T, VL_BUF_T>::timeResStr() const {
+template <>
+std::string VerilatedTrace<VL_SUB_T, VL_BUF_T>::timeResStr() const {
     return doubleToTimescale(m_timeRes);
 }
 
 //=========================================================================
 // External interface to client code
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::set_time_unit(const char* unitp) VL_MT_SAFE {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::set_time_unit(const char* unitp) VL_MT_SAFE {
     m_timeUnit = timescaleToDouble(unitp);
 }
 template <>
@@ -456,7 +469,7 @@ void VerilatedTrace<VL_SUB_T, VL_BUF_T>::dumpvars(int level, const std::string&
 }
 
 #ifdef VL_THREADED
-template <>  //
+template <>
 void VerilatedTrace<VL_SUB_T, VL_BUF_T>::parallelWorkerTask(void* datap, bool) {
     ParallelWorkerData* const wdp = reinterpret_cast<ParallelWorkerData*>(datap);
     // Run the task
@@ -467,7 +480,8 @@ void VerilatedTrace<VL_SUB_T, VL_BUF_T>::parallelWorkerTask(void* datap, bool) {
     if (wdp->m_waiting) wdp->m_cv.notify_one();
 }
 
-template <> VL_ATTR_NOINLINE void VerilatedTrace<VL_SUB_T, VL_BUF_T>::ParallelWorkerData::wait() {
+template <>
+VL_ATTR_NOINLINE void VerilatedTrace<VL_SUB_T, VL_BUF_T>::ParallelWorkerData::wait() {
     // Spin for a while, waiting for the buffer to become ready
     for (int i = 0; i < VL_LOCK_SPINS; ++i) {
         if (VL_LIKELY(m_ready.load(std::memory_order_relaxed))) return;
@@ -723,11 +737,13 @@ void VerilatedTrace<VL_SUB_T, VL_BUF_T>::addCleanupCb(cleanupCb_t cb, void* user
     addCallbackRecord(m_cleanupCbs, CallbackRecord{cb, userp});
 }
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::pushNamePrefix(const std::string& prefix) {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::pushNamePrefix(const std::string& prefix) {
     m_namePrefixStack.push_back(m_namePrefixStack.back() + prefix);
 }
 
-template <> void VerilatedTrace<VL_SUB_T, VL_BUF_T>::popNamePrefix(unsigned count) {
+template <>
+void VerilatedTrace<VL_SUB_T, VL_BUF_T>::popNamePrefix(unsigned count) {
     while (count--) m_namePrefixStack.pop_back();
     assert(!m_namePrefixStack.empty());
 }
@@ -825,7 +841,7 @@ static inline void cvtQDataToStr(char* dstp, QData value) {
 //=========================================================================
 // VerilatedTraceBuffer
 
-template <>  //
+template <>
 VerilatedTraceBuffer<VL_BUF_T>::VerilatedTraceBuffer(Trace& owner)
     : VL_BUF_T{owner}
     , m_sigs_oldvalp{owner.m_sigs_oldvalp}
@@ -836,7 +852,7 @@ VerilatedTraceBuffer<VL_BUF_T>::VerilatedTraceBuffer(Trace& owner)
 // that this file must be included in the format specific implementation, so
 // the emit* functions can be inlined for performance.
 
-template <>  //
+template <>
 void VerilatedTraceBuffer<VL_BUF_T>::fullBit(uint32_t* oldp, CData newval) {
     const uint32_t code = oldp - m_sigs_oldvalp;
     *oldp = newval;  // Still copy even if not tracing so chg doesn't call full
@@ -884,7 +900,7 @@ void VerilatedTraceBuffer<VL_BUF_T>::fullWData(uint32_t* oldp, const WData* newv
     emitWData(code, newvalp, bits);
 }
 
-template <>  //
+template <>
 void VerilatedTraceBuffer<VL_BUF_T>::fullDouble(uint32_t* oldp, double newval) {
     const uint32_t code = oldp - m_sigs_oldvalp;
     *reinterpret_cast<double*>(oldp) = newval;
@@ -897,7 +913,7 @@ void VerilatedTraceBuffer<VL_BUF_T>::fullDouble(uint32_t* oldp, double newval) {
 //=========================================================================
 // VerilatedTraceOffloadBuffer
 
-template <>  //
+template <>
 VerilatedTraceOffloadBuffer<VL_BUF_T>::VerilatedTraceOffloadBuffer(VL_SUB_T& owner)
     : VerilatedTraceBuffer<VL_BUF_T>{owner}
     , m_offloadBufferWritep{owner.m_offloadBufferWritep}
diff --git a/include/verilated_types.h b/include/verilated_types.h
index 93906b1d3..d11aee5d7 100644
--- a/include/verilated_types.h
+++ b/include/verilated_types.h
@@ -131,7 +131,8 @@ public:
 
 static int _vl_cmp_w(int words, WDataInP const lwp, WDataInP const rwp) VL_MT_SAFE;
 
-template <std::size_t T_Words> struct VlWide final {
+template <std::size_t T_Words>
+struct VlWide final {
     // MEMBERS
     // This should be the only data member, otherwise generated static initializers need updating
     EData m_storage[T_Words];  // Contents of the packed array
@@ -163,7 +164,8 @@ VlWide<T_Words>& VL_CVT_W_A(const WDataInP inp, const VlWide<T_Words>&) {
     return *((VlWide<T_Words>*)inp);
 }
 
-template <std::size_t T_Words> std::string VL_TO_STRING(const VlWide<T_Words>& obj) {
+template <std::size_t T_Words>
+std::string VL_TO_STRING(const VlWide<T_Words>& obj) {
     return VL_TO_STRING_W(T_Words, obj.data());
 }
 
@@ -174,7 +176,8 @@ template <std::size_t T_Words> std::string VL_TO_STRING(const VlWide<T_Words>& o
 //
 // Bound here is the maximum size() allowed, e.g. 1 + SystemVerilog bound
 // For dynamic arrays it is always zero
-template <class T_Value, size_t T_MaxSize = 0> class VlQueue final {
+template <class T_Value, size_t T_MaxSize = 0>
+class VlQueue final {
 private:
     // TYPES
     using Deque = std::deque<T_Value>;
@@ -199,7 +202,8 @@ public:
 
     // Standard copy constructor works. Verilog: assoca = assocb
     // Also must allow conversion from a different T_MaxSize queue
-    template <size_t U_MaxSize = 0> VlQueue operator=(const VlQueue<T_Value, U_MaxSize>& rhs) {
+    template <size_t U_MaxSize = 0>
+    VlQueue operator=(const VlQueue<T_Value, U_MaxSize>& rhs) {
         m_deque = rhs.privateDeque();
         if (VL_UNLIKELY(T_MaxSize && T_MaxSize < m_deque.size())) m_deque.resize(T_MaxSize - 1);
         return *this;
@@ -330,7 +334,8 @@ public:
 
     // Methods
     void sort() { std::sort(m_deque.begin(), m_deque.end()); }
-    template <typename Func> void sort(Func with_func) {
+    template <typename Func>
+    void sort(Func with_func) {
         // with_func returns arbitrary type to use for the sort comparison
         std::sort(m_deque.begin(), m_deque.end(), [=](const T_Value& a, const T_Value& b) {
             // index number is meaninless with sort, as it changes
@@ -338,7 +343,8 @@ public:
         });
     }
     void rsort() { std::sort(m_deque.rbegin(), m_deque.rend()); }
-    template <typename Func> void rsort(Func with_func) {
+    template <typename Func>
+    void rsort(Func with_func) {
         // with_func returns arbitrary type to use for the sort comparison
         std::sort(m_deque.rbegin(), m_deque.rend(), [=](const T_Value& a, const T_Value& b) {
             // index number is meaninless with sort, as it changes
@@ -373,7 +379,8 @@ public:
         }
         return out;
     }
-    template <typename Func> VlQueue find(Func with_func) const {
+    template <typename Func>
+    VlQueue find(Func with_func) const {
         VlQueue out;
         IData index = 0;
         for (const auto& i : m_deque) {
@@ -382,7 +389,8 @@ public:
         }
         return out;
     }
-    template <typename Func> VlQueue<IData> find_index(Func with_func) const {
+    template <typename Func>
+    VlQueue<IData> find_index(Func with_func) const {
         VlQueue<IData> out;
         IData index = 0;
         for (const auto& i : m_deque) {
@@ -391,7 +399,8 @@ public:
         }
         return out;
     }
-    template <typename Func> VlQueue find_first(Func with_func) const {
+    template <typename Func>
+    VlQueue find_first(Func with_func) const {
         // Can't use std::find_if as need index number
         IData index = 0;
         for (const auto& i : m_deque) {
@@ -400,7 +409,8 @@ public:
         }
         return VlQueue{};
     }
-    template <typename Func> VlQueue<IData> find_first_index(Func with_func) const {
+    template <typename Func>
+    VlQueue<IData> find_first_index(Func with_func) const {
         IData index = 0;
         for (const auto& i : m_deque) {
             if (with_func(index, i)) return VlQueue<IData>::cons(index);
@@ -408,7 +418,8 @@ public:
         }
         return VlQueue<IData>{};
     }
-    template <typename Func> VlQueue find_last(Func with_func) const {
+    template <typename Func>
+    VlQueue find_last(Func with_func) const {
         IData index = m_deque.size() - 1;
         for (auto& item : vlstd::reverse_view(m_deque)) {
             if (with_func(index, item)) return VlQueue::cons(item);
@@ -416,7 +427,8 @@ public:
         }
         return VlQueue{};
     }
-    template <typename Func> VlQueue<IData> find_last_index(Func with_func) const {
+    template <typename Func>
+    VlQueue<IData> find_last_index(Func with_func) const {
         IData index = m_deque.size() - 1;
         for (auto& item : vlstd::reverse_view(m_deque)) {
             if (with_func(index, item)) return VlQueue<IData>::cons(index);
@@ -442,7 +454,8 @@ public:
         for (const auto& i : m_deque) out += i;
         return out;
     }
-    template <typename Func> T_Value r_sum(Func with_func) const {
+    template <typename Func>
+    T_Value r_sum(Func with_func) const {
         T_Value out(0);  // Type must have assignment operator
         IData index = 0;
         for (const auto& i : m_deque) out += with_func(index++, i);
@@ -456,7 +469,8 @@ public:
         for (; it != m_deque.end(); ++it) out *= *it;
         return out;
     }
-    template <typename Func> T_Value r_product(Func with_func) const {
+    template <typename Func>
+    T_Value r_product(Func with_func) const {
         if (m_deque.empty()) return T_Value(0);
         auto it = m_deque.begin();
         IData index = 0;
@@ -474,7 +488,8 @@ public:
         for (; it != m_deque.end(); ++it) out &= *it;
         return out;
     }
-    template <typename Func> T_Value r_and(Func with_func) const {
+    template <typename Func>
+    T_Value r_and(Func with_func) const {
         if (m_deque.empty()) return T_Value(0);
         auto it = m_deque.begin();
         IData index = 0;
@@ -489,7 +504,8 @@ public:
         for (const auto& i : m_deque) out |= i;
         return out;
     }
-    template <typename Func> T_Value r_or(Func with_func) const {
+    template <typename Func>
+    T_Value r_or(Func with_func) const {
         T_Value out(0);  // Type must have assignment operator
         IData index = 0;
         for (const auto& i : m_deque) out |= with_func(index++, i);
@@ -500,7 +516,8 @@ public:
         for (const auto& i : m_deque) out ^= i;
         return out;
     }
-    template <typename Func> T_Value r_xor(Func with_func) const {
+    template <typename Func>
+    T_Value r_xor(Func with_func) const {
         T_Value out(0);  // Type must have assignment operator
         IData index = 0;
         for (const auto& i : m_deque) out ^= with_func(index++, i);
@@ -520,7 +537,8 @@ public:
     }
 };
 
-template <class T_Value> std::string VL_TO_STRING(const VlQueue<T_Value>& obj) {
+template <class T_Value>
+std::string VL_TO_STRING(const VlQueue<T_Value>& obj) {
     return obj.to_string();
 }
 
@@ -529,7 +547,8 @@ template <class T_Value> std::string VL_TO_STRING(const VlQueue<T_Value>& obj) {
 // There are no multithreaded locks on this; the base variable must
 // be protected by other means
 //
-template <class T_Key, class T_Value> class VlAssocArray final {
+template <class T_Key, class T_Value>
+class VlAssocArray final {
 private:
     // TYPES
     using Map = std::map<T_Key, T_Value>;
@@ -654,19 +673,22 @@ public:
         }
         return out;
     }
-    template <typename Func> VlQueue<T_Value> find(Func with_func) const {
+    template <typename Func>
+    VlQueue<T_Value> find(Func with_func) const {
         VlQueue<T_Value> out;
         for (const auto& i : m_map)
             if (with_func(i.first, i.second)) out.push_back(i.second);
         return out;
     }
-    template <typename Func> VlQueue<T_Key> find_index(Func with_func) const {
+    template <typename Func>
+    VlQueue<T_Key> find_index(Func with_func) const {
         VlQueue<T_Key> out;
         for (const auto& i : m_map)
             if (with_func(i.first, i.second)) out.push_back(i.first);
         return out;
     }
-    template <typename Func> VlQueue<T_Value> find_first(Func with_func) const {
+    template <typename Func>
+    VlQueue<T_Value> find_first(Func with_func) const {
         const auto it
             = std::find_if(m_map.begin(), m_map.end(), [=](const std::pair<T_Key, T_Value>& i) {
                   return with_func(i.first, i.second);
@@ -674,7 +696,8 @@ public:
         if (it == m_map.end()) return VlQueue<T_Value>{};
         return VlQueue<T_Value>::cons(it->second);
     }
-    template <typename Func> VlQueue<T_Key> find_first_index(Func with_func) const {
+    template <typename Func>
+    VlQueue<T_Key> find_first_index(Func with_func) const {
         const auto it
             = std::find_if(m_map.begin(), m_map.end(), [=](const std::pair<T_Key, T_Value>& i) {
                   return with_func(i.first, i.second);
@@ -682,7 +705,8 @@ public:
         if (it == m_map.end()) return VlQueue<T_Value>{};
         return VlQueue<T_Key>::cons(it->first);
     }
-    template <typename Func> VlQueue<T_Value> find_last(Func with_func) const {
+    template <typename Func>
+    VlQueue<T_Value> find_last(Func with_func) const {
         const auto it
             = std::find_if(m_map.rbegin(), m_map.rend(), [=](const std::pair<T_Key, T_Value>& i) {
                   return with_func(i.first, i.second);
@@ -690,7 +714,8 @@ public:
         if (it == m_map.rend()) return VlQueue<T_Value>{};
         return VlQueue<T_Value>::cons(it->second);
     }
-    template <typename Func> VlQueue<T_Key> find_last_index(Func with_func) const {
+    template <typename Func>
+    VlQueue<T_Key> find_last_index(Func with_func) const {
         const auto it
             = std::find_if(m_map.rbegin(), m_map.rend(), [=](const std::pair<T_Key, T_Value>& i) {
                   return with_func(i.first, i.second);
@@ -724,7 +749,8 @@ public:
         for (const auto& i : m_map) out += i.second;
         return out;
     }
-    template <typename Func> T_Value r_sum(Func with_func) const {
+    template <typename Func>
+    T_Value r_sum(Func with_func) const {
         T_Value out(0);  // Type must have assignment operator
         for (const auto& i : m_map) out += with_func(i.first, i.second);
         return out;
@@ -737,7 +763,8 @@ public:
         for (; it != m_map.end(); ++it) out *= it->second;
         return out;
     }
-    template <typename Func> T_Value r_product(Func with_func) const {
+    template <typename Func>
+    T_Value r_product(Func with_func) const {
         if (m_map.empty()) return T_Value(0);
         auto it = m_map.begin();
         T_Value out{with_func(it->first, it->second)};
@@ -753,7 +780,8 @@ public:
         for (; it != m_map.end(); ++it) out &= it->second;
         return out;
     }
-    template <typename Func> T_Value r_and(Func with_func) const {
+    template <typename Func>
+    T_Value r_and(Func with_func) const {
         if (m_map.empty()) return T_Value(0);
         auto it = m_map.begin();
         T_Value out{with_func(it->first, it->second)};
@@ -766,7 +794,8 @@ public:
         for (const auto& i : m_map) out |= i.second;
         return out;
     }
-    template <typename Func> T_Value r_or(Func with_func) const {
+    template <typename Func>
+    T_Value r_or(Func with_func) const {
         T_Value out(0);  // Type must have assignment operator
         for (const auto& i : m_map) out |= with_func(i.first, i.second);
         return out;
@@ -776,7 +805,8 @@ public:
         for (const auto& i : m_map) out ^= i.second;
         return out;
     }
-    template <typename Func> T_Value r_xor(Func with_func) const {
+    template <typename Func>
+    T_Value r_xor(Func with_func) const {
         T_Value out(0);  // Type must have assignment operator
         for (const auto& i : m_map) out ^= with_func(i.first, i.second);
         return out;
@@ -839,7 +869,8 @@ void VL_WRITEMEM_N(bool hex, int bits, const std::string& filename,
 /// This class may get exposed to a Verilated Model's top I/O, if the top
 /// IO has an unpacked array.
 
-template <class T_Value, std::size_t T_Depth> struct VlUnpacked final {
+template <class T_Value, std::size_t T_Depth>
+struct VlUnpacked final {
     // MEMBERS
     // This should be the only data member, otherwise generated static initializers need updating
     T_Value m_storage[T_Depth];  // Contents of the unpacked array
diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp
index 342ba7b2c..9681e1883 100644
--- a/include/verilated_vcd_c.cpp
+++ b/include/verilated_vcd_c.cpp
@@ -65,7 +65,8 @@ constexpr unsigned VL_TRACE_SUFFIX_ENTRY_SIZE = 8;  // Size of a suffix entry
 //=============================================================================
 // Utility functions: TODO: put these in a common place and share them.
 
-template <size_t N> static size_t roundUpToMultipleOf(size_t value) {
+template <size_t N>
+static size_t roundUpToMultipleOf(size_t value) {
     static_assert((N & (N - 1)) == 0, "'N' must be a power of 2");
     size_t mask = N - 1;
     return (value + mask) & ~mask;
diff --git a/include/verilated_vcd_c.h b/include/verilated_vcd_c.h
index 0d2003eba..153401b29 100644
--- a/include/verilated_vcd_c.h
+++ b/include/verilated_vcd_c.h
@@ -151,12 +151,18 @@ public:
 
 #ifndef DOXYGEN
 // Declare specialization here as it's used in VerilatedFstC just below
-template <> void VerilatedVcd::Super::dump(uint64_t time);
-template <> void VerilatedVcd::Super::set_time_unit(const char* unitp);
-template <> void VerilatedVcd::Super::set_time_unit(const std::string& unit);
-template <> void VerilatedVcd::Super::set_time_resolution(const char* unitp);
-template <> void VerilatedVcd::Super::set_time_resolution(const std::string& unit);
-template <> void VerilatedVcd::Super::dumpvars(int level, const std::string& hier);
+template <>
+void VerilatedVcd::Super::dump(uint64_t time);
+template <>
+void VerilatedVcd::Super::set_time_unit(const char* unitp);
+template <>
+void VerilatedVcd::Super::set_time_unit(const std::string& unit);
+template <>
+void VerilatedVcd::Super::set_time_resolution(const char* unitp);
+template <>
+void VerilatedVcd::Super::set_time_resolution(const std::string& unit);
+template <>
+void VerilatedVcd::Super::dumpvars(int level, const std::string& hier);
 #endif  // DOXYGEN
 
 //=============================================================================
diff --git a/include/verilated_vcd_sc.cpp b/include/verilated_vcd_sc.cpp
index 0ebff7554..20f9a426a 100644
--- a/include/verilated_vcd_sc.cpp
+++ b/include/verilated_vcd_sc.cpp
@@ -22,6 +22,7 @@
 //=============================================================================
 
 #include "verilatedos.h"
+
 #include "verilated_vcd_sc.h"
 
 //======================================================================
diff --git a/include/verilated_vcd_sc.h b/include/verilated_vcd_sc.h
index 6f8edf3a1..a32134b23 100644
--- a/include/verilated_vcd_sc.h
+++ b/include/verilated_vcd_sc.h
@@ -23,6 +23,7 @@
 #define VERILATOR_VERILATED_VCD_SC_H_
 
 #include "verilatedos.h"
+
 #include "verilated_sc.h"
 #include "verilated_vcd_c.h"
 
diff --git a/include/verilated_vpi.cpp b/include/verilated_vpi.cpp
index 77c79412b..ff2d25c27 100644
--- a/include/verilated_vpi.cpp
+++ b/include/verilated_vpi.cpp
@@ -26,8 +26,9 @@
 
 #define VERILATOR_VERILATED_VPI_CPP_
 
-#include "verilated.h"
 #include "verilated_vpi.h"
+
+#include "verilated.h"
 #include "verilated_imp.h"
 
 #include <list>
diff --git a/include/verilated_vpi.h b/include/verilated_vpi.h
index 9097b0c35..aeb58e210 100644
--- a/include/verilated_vpi.h
+++ b/include/verilated_vpi.h
@@ -25,6 +25,7 @@
 #define VERILATOR_VERILATED_VPI_H_
 
 #include "verilatedos.h"
+
 #include "verilated.h"
 #include "verilated_syms.h"
 
diff --git a/include/verilatedos.h b/include/verilatedos.h
index 5c74bc065..d06d5fd99 100644
--- a/include/verilatedos.h
+++ b/include/verilatedos.h
@@ -534,7 +534,8 @@ using ssize_t = uint32_t;  ///< signed size_t; returned from read()
 
 namespace vlstd {
 
-template <typename T> struct reverse_wrapper {
+template <typename T>
+struct reverse_wrapper {
     const T& m_v;
 
     explicit reverse_wrapper(const T& a_v)
@@ -544,10 +545,16 @@ template <typename T> struct reverse_wrapper {
 };
 
 // C++20's std::ranges::reverse_view
-template <typename T> reverse_wrapper<T> reverse_view(const T& v) { return reverse_wrapper<T>(v); }
+template <typename T>
+reverse_wrapper<T> reverse_view(const T& v) {
+    return reverse_wrapper<T>(v);
+}
 
 // C++17's std::as_const
-template <class T> T const& as_const(T& v) { return v; }
+template <class T>
+T const& as_const(T& v) {
+    return v;
+}
 };  // namespace vlstd
 
 //=========================================================================
diff --git a/src/V3Active.cpp b/src/V3Active.cpp
index ba69b1b27..fa629c11f 100644
--- a/src/V3Active.cpp
+++ b/src/V3Active.cpp
@@ -29,10 +29,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Active.h"
+
 #include "V3Ast.h"
 #include "V3Const.h"
+#include "V3Global.h"
 #include "V3Graph.h"
 
 #include <unordered_map>
diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp
index f4f9782b1..e39742dbd 100644
--- a/src/V3ActiveTop.cpp
+++ b/src/V3ActiveTop.cpp
@@ -26,11 +26,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3ActiveTop.h"
+
 #include "V3Ast.h"
-#include "V3SenTree.h"
 #include "V3Const.h"
+#include "V3Global.h"
+#include "V3SenTree.h"
 
 //######################################################################
 // Active class functions
diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp
index dd58d3674..86e8710a8 100644
--- a/src/V3Assert.cpp
+++ b/src/V3Assert.cpp
@@ -17,9 +17,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Assert.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Stats.h"
 
 //######################################################################
diff --git a/src/V3Assert.h b/src/V3Assert.h
index 3846ef589..d20b9b436 100644
--- a/src/V3Assert.h
+++ b/src/V3Assert.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 
 //============================================================================
 
diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp
index a0ed59aee..705dfcbb2 100644
--- a/src/V3AssertPre.cpp
+++ b/src/V3AssertPre.cpp
@@ -20,9 +20,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3AssertPre.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 //######################################################################
 // Assert class functions
diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index de595be61..83b5052ad 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -18,10 +18,11 @@
 #include "verilatedos.h"
 
 #include "V3Ast.h"
-#include "V3File.h"
-#include "V3Global.h"
+
 #include "V3Broken.h"
 #include "V3EmitV.h"
+#include "V3File.h"
+#include "V3Global.h"
 #include "V3String.h"
 
 #include <iomanip>
diff --git a/src/V3Ast.h b/src/V3Ast.h
index 45fe1fc98..c527c71f9 100644
--- a/src/V3Ast.h
+++ b/src/V3Ast.h
@@ -20,11 +20,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3Broken.h"
 #include "V3Error.h"
 #include "V3FileLine.h"
-#include "V3Number.h"
 #include "V3Global.h"
-#include "V3Broken.h"
+#include "V3Number.h"
+
+#include "V3Ast__gen_classes.h"  // From ./astgen
 
 #include <cmath>
 #include <functional>
@@ -34,8 +36,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-
-#include "V3Ast__gen_classes.h"  // From ./astgen
 // Things like:
 //   class V3AstNode;
 
@@ -1133,7 +1133,7 @@ public:
     explicit VNUser(void* p) { m_u.up = p; }
     ~VNUser() = default;
     // Casters
-    template <class T>  //
+    template <class T>
     typename std::enable_if<std::is_pointer<T>::value, T>::type to() const {
         return reinterpret_cast<T>(m_u.up);
     }
@@ -1857,10 +1857,12 @@ private:
 
     // For internal use only.
     // Note: specializations for particular node types are provided by 'astgen'
-    template <typename T> inline static bool privateTypeTest(const AstNode* nodep);
+    template <typename T>
+    inline static bool privateTypeTest(const AstNode* nodep);
 
     // For internal use only.
-    template <typename TargetType, typename DeclType> constexpr static bool uselessCast() {
+    template <typename TargetType, typename DeclType>
+    constexpr static bool uselessCast() {
         using NonRef = typename std::remove_reference<DeclType>::type;
         using NonPtr = typename std::remove_pointer<NonRef>::type;
         using NonCV = typename std::remove_cv<NonPtr>::type;
@@ -1868,7 +1870,8 @@ private:
     }
 
     // For internal use only.
-    template <typename TargetType, typename DeclType> constexpr static bool impossibleCast() {
+    template <typename TargetType, typename DeclType>
+    constexpr static bool impossibleCast() {
         using NonRef = typename std::remove_reference<DeclType>::type;
         using NonPtr = typename std::remove_pointer<NonRef>::type;
         using NonCV = typename std::remove_cv<NonPtr>::type;
@@ -1877,20 +1880,23 @@ private:
 
 public:
     // For use via the VN_IS macro only
-    template <typename T, typename E> inline static bool privateIs(const AstNode* nodep) {
+    template <typename T, typename E>
+    inline static bool privateIs(const AstNode* nodep) {
         static_assert(!uselessCast<T, E>(), "Unnecessary VN_IS, node known to have target type.");
         static_assert(!impossibleCast<T, E>(), "Unnecessary VN_IS, node cannot be this type.");
         return nodep && privateTypeTest<T>(nodep);
     }
 
     // For use via the VN_CAST macro only
-    template <typename T, typename E> inline static T* privateCast(AstNode* nodep) {
+    template <typename T, typename E>
+    inline static T* privateCast(AstNode* nodep) {
         static_assert(!uselessCast<T, E>(),
                       "Unnecessary VN_CAST, node known to have target type.");
         static_assert(!impossibleCast<T, E>(), "Unnecessary VN_CAST, node cannot be this type.");
         return nodep && privateTypeTest<T>(nodep) ? reinterpret_cast<T*>(nodep) : nullptr;
     }
-    template <typename T, typename E> inline static const T* privateCast(const AstNode* nodep) {
+    template <typename T, typename E>
+    inline static const T* privateCast(const AstNode* nodep) {
         static_assert(!uselessCast<T, E>(),
                       "Unnecessary VN_CAST, node known to have target type.");
         static_assert(!impossibleCast<T, E>(), "Unnecessary VN_CAST, node cannot be this type.");
@@ -1898,7 +1904,8 @@ public:
     }
 
     // For use via the VN_AS macro only
-    template <typename T, typename E> inline static T* privateAs(AstNode* nodep) {
+    template <typename T, typename E>
+    inline static T* privateAs(AstNode* nodep) {
         static_assert(!uselessCast<T, E>(), "Unnecessary VN_AS, node known to have target type.");
         static_assert(!impossibleCast<T, E>(), "Unnecessary VN_AS, node cannot be this type.");
         UASSERT_OBJ(!nodep || privateTypeTest<T>(nodep), nodep,
@@ -1906,7 +1913,8 @@ public:
                                                                               << "'");
         return reinterpret_cast<T*>(nodep);
     }
-    template <typename T, typename E> inline static const T* privateAs(const AstNode* nodep) {
+    template <typename T, typename E>
+    inline static const T* privateAs(const AstNode* nodep) {
         static_assert(!uselessCast<T, E>(), "Unnecessary VN_AS, node known to have target type.");
         static_assert(!impossibleCast<T, E>(), "Unnecessary VN_AS, node cannot be this type.");
         UASSERT_OBJ(!nodep || privateTypeTest<T>(nodep), nodep,
@@ -1918,7 +1926,8 @@ public:
     // Predicate that returns true if the given 'nodep' might have a descendant of type 'T_Node'.
     // This is conservative and is used to speed up traversals.
     // Note: specializations for particular node types are provided below
-    template <typename T_Node> static bool mayBeUnder(const AstNode* nodep) {
+    template <typename T_Node>
+    static bool mayBeUnder(const AstNode* nodep) {
         static_assert(!std::is_const<T_Node>::value,
                       "Type parameter 'T_Node' should not be const qualified");
         static_assert(std::is_base_of<AstNode, T_Node>::value,
@@ -1929,7 +1938,8 @@ public:
     // Predicate that is true for node subtypes 'T_Node' that do not have any children
     // This is conservative and is used to speed up traversals.
     // Note: specializations for particular node types are provided below
-    template <typename T_Node> static constexpr bool isLeaf() {
+    template <typename T_Node>
+    static constexpr bool isLeaf() {
         static_assert(!std::is_const<T_Node>::value,
                       "Type parameter 'T_Node' should not be const qualified");
         static_assert(std::is_base_of<AstNode, T_Node>::value,
@@ -1951,7 +1961,8 @@ private:
     inline static bool predicateImpl(ConstCorrectAstNode<T_Arg>* nodep,
                                      const std::function<bool(T_Arg*)>& p);
 
-    template <typename T_Node> constexpr static bool checkTypeParameter() {
+    template <typename T_Node>
+    constexpr static bool checkTypeParameter() {
         static_assert(!std::is_const<T_Node>::value,
                       "Type parameter 'T_Node' should not be const qualified");
         static_assert(std::is_base_of<AstNode, T_Node>::value,
@@ -1966,25 +1977,29 @@ public:
     // handle a single (or a few) node types, as it's easier to write, but more importantly, the
     // dispatch to the operation function in 'foreach' should be completely predictable by branch
     // target caches in modern CPUs, while it is basically unpredictable for VNVisitor.
-    template <typename T_Node> void foreach (std::function<void(T_Node*)> f) {
+    template <typename T_Node>
+    void foreach (std::function<void(T_Node*)> f) {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         foreachImpl<T_Node>(this, f, /* visitNext: */ false);
     }
 
     // Same as above, but for 'const' nodes
-    template <typename T_Node> void foreach (std::function<void(const T_Node*)> f) const {
+    template <typename T_Node>
+    void foreach (std::function<void(const T_Node*)> f) const {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         foreachImpl<const T_Node>(this, f, /* visitNext: */ false);
     }
 
     // Same as 'foreach' but also follows 'this->nextp()'
-    template <typename T_Node> void foreachAndNext(std::function<void(T_Node*)> f) {
+    template <typename T_Node>
+    void foreachAndNext(std::function<void(T_Node*)> f) {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         foreachImpl<T_Node>(this, f, /* visitNext: */ true);
     }
 
     // Same as 'foreach' but also follows 'this->nextp()'
-    template <typename T_Node> void foreachAndNext(std::function<void(const T_Node*)> f) const {
+    template <typename T_Node>
+    void foreachAndNext(std::function<void(const T_Node*)> f) const {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         foreachImpl<const T_Node>(this, f, /* visitNext: */ true);
     }
@@ -1993,13 +2008,15 @@ public:
     // 'T_Node' that satisfies the predicate 'p'. Returns false if no node of type 'T_Node' is
     // present. Traversal is performed in some arbitrary order and is terminated as soon as the
     // result can be determined.
-    template <typename T_Node> bool exists(std::function<bool(T_Node*)> p) {
+    template <typename T_Node>
+    bool exists(std::function<bool(T_Node*)> p) {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         return predicateImpl<T_Node, /* Default: */ false>(this, p);
     }
 
     // Same as above, but for 'const' nodes
-    template <typename T_Node> void exists(std::function<bool(const T_Node*)> p) const {
+    template <typename T_Node>
+    void exists(std::function<bool(const T_Node*)> p) const {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         return predicateImpl<const T_Node, /* Default: */ false>(this, p);
     }
@@ -2008,13 +2025,15 @@ public:
     // 'T_Node' satisfy the predicate 'p'. Returns true if no node of type 'T_Node' is
     // present. Traversal is performed in some arbitrary order and is terminated as soon as the
     // result can be determined.
-    template <typename T_Node> bool forall(std::function<bool(T_Node*)> p) {
+    template <typename T_Node>
+    bool forall(std::function<bool(T_Node*)> p) {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         return predicateImpl<T_Node, /* Default: */ true>(this, p);
     }
 
     // Same as above, but for 'const' nodes
-    template <typename T_Node> void forall(std::function<bool(const T_Node*)> p) const {
+    template <typename T_Node>
+    void forall(std::function<bool(const T_Node*)> p) const {
         static_assert(checkTypeParameter<T_Node>(), "Invalid type parameter 'T_Node'");
         return predicateImpl<const T_Node, /* Default: */ true>(this, p);
     }
@@ -2031,13 +2050,16 @@ public:
 #include "V3Ast__gen_impl.h"  // From ./astgen
 
 // Specializations of AstNode::mayBeUnder
-template <> inline bool AstNode::mayBeUnder<AstCell>(const AstNode* nodep) {
+template <>
+inline bool AstNode::mayBeUnder<AstCell>(const AstNode* nodep) {
     return !VN_IS(nodep, NodeStmt) && !VN_IS(nodep, NodeMath);
 }
-template <> inline bool AstNode::mayBeUnder<AstNodeAssign>(const AstNode* nodep) {
+template <>
+inline bool AstNode::mayBeUnder<AstNodeAssign>(const AstNode* nodep) {
     return !VN_IS(nodep, NodeMath);
 }
-template <> inline bool AstNode::mayBeUnder<AstVarScope>(const AstNode* nodep) {
+template <>
+inline bool AstNode::mayBeUnder<AstVarScope>(const AstNode* nodep) {
     if (VN_IS(nodep, VarScope)) return false;  // Should not nest
     if (VN_IS(nodep, Var)) return false;
     if (VN_IS(nodep, Active)) return false;
@@ -2045,16 +2067,26 @@ template <> inline bool AstNode::mayBeUnder<AstVarScope>(const AstNode* nodep) {
     if (VN_IS(nodep, NodeMath)) return false;
     return true;
 }
-template <> inline bool AstNode::mayBeUnder<AstExecGraph>(const AstNode* nodep) {
+template <>
+inline bool AstNode::mayBeUnder<AstExecGraph>(const AstNode* nodep) {
     if (VN_IS(nodep, ExecGraph)) return false;  // Should not nest
     if (VN_IS(nodep, NodeStmt)) return false;  // Should be directly under CFunc
     return true;
 }
 
 // Specializations of AstNode::isLeaf
-template <> constexpr bool AstNode::isLeaf<AstNodeVarRef>() { return true; }
-template <> constexpr bool AstNode::isLeaf<AstVarRef>() { return true; }
-template <> constexpr bool AstNode::isLeaf<AstVarXRef>() { return true; }
+template <>
+constexpr bool AstNode::isLeaf<AstNodeVarRef>() {
+    return true;
+}
+template <>
+constexpr bool AstNode::isLeaf<AstVarRef>() {
+    return true;
+}
+template <>
+constexpr bool AstNode::isLeaf<AstVarXRef>() {
+    return true;
+}
 
 // foreach implementation
 template <typename T_Arg>
@@ -2238,7 +2270,7 @@ inline void VNRelinker::relink(AstNode* newp) { newp->AstNode::relink(this); }
 //######################################################################
 
 // VNRef is std::reference_wrapper that can only hold AstNode subtypes
-template <typename T_Node>  //
+template <typename T_Node>
 class VNRef final : public std::reference_wrapper<T_Node> {
     static_assert(std::is_base_of<AstNode, T_Node>::value,
                   "Type parameter 'T_Node' must be a subtype of AstNode");
@@ -2264,13 +2296,13 @@ static_assert(sizeof(VNRef<AstNode>) == sizeof(std::reference_wrapper<AstNode>),
 size_t V3HasherUncachedHash(const AstNode&);
 
 // Specialization of std::hash for VNRef
-template <typename T_Node>  //
+template <typename T_Node>
 struct std::hash<VNRef<T_Node>> final {
     size_t operator()(VNRef<T_Node> r) const { return V3HasherUncachedHash(r); }
 };
 
 // Specialization of std::equal_to for VNRef
-template <typename T_Node>  //
+template <typename T_Node>
 struct std::equal_to<VNRef<T_Node>> final {
     size_t operator()(VNRef<T_Node> ra, VNRef<T_Node> rb) const {
         return ra.get().sameTree(&(rb.get()));
diff --git a/src/V3AstUserAllocator.h b/src/V3AstUserAllocator.h
index f8982bf16..76ec4fc5d 100644
--- a/src/V3AstUserAllocator.h
+++ b/src/V3AstUserAllocator.h
@@ -27,7 +27,8 @@
 #include <utility>
 #include <vector>
 
-template <class T_Node, class T_Data, int T_UserN> class AstUserAllocatorBase VL_NOT_FINAL {
+template <class T_Node, class T_Data, int T_UserN>
+class AstUserAllocatorBase VL_NOT_FINAL {
     static_assert(1 <= T_UserN && T_UserN <= 5, "Wrong user pointer number");
     static_assert(std::is_base_of<AstNode, T_Node>::value, "T_Node must be an AstNode type");
 
@@ -91,7 +92,7 @@ protected:
 
 public:
     // Get a reference to the user data. If does not exist, construct it with given arguments.
-    template <typename... Args>  //
+    template <typename... Args>
     T_Data& operator()(T_Node* nodep, Args&&... args) {
         T_Data* userp = getUserp(nodep);
         if (!userp) {
diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp
index f2d74b678..0e4176739 100644
--- a/src/V3Begin.cpp
+++ b/src/V3Begin.cpp
@@ -28,9 +28,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Begin.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 
diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp
index a7d751d37..51c749eb4 100644
--- a/src/V3Branch.cpp
+++ b/src/V3Branch.cpp
@@ -26,9 +26,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Branch.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <map>
 
diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp
index 2eb5de33b..6f1f906e8 100644
--- a/src/V3Broken.cpp
+++ b/src/V3Broken.cpp
@@ -25,9 +25,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Broken.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators
 #include "V3AstConstOnly.h"
diff --git a/src/V3CCtors.cpp b/src/V3CCtors.cpp
index 2ebb9f73c..f28e959fc 100644
--- a/src/V3CCtors.cpp
+++ b/src/V3CCtors.cpp
@@ -27,10 +27,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3EmitCBase.h"
 #include "V3CCtors.h"
 
+#include "V3EmitCBase.h"
+#include "V3Global.h"
+
 #include <algorithm>
 #include <list>
 
diff --git a/src/V3CUse.cpp b/src/V3CUse.cpp
index cf52c03da..2d301567e 100644
--- a/src/V3CUse.cpp
+++ b/src/V3CUse.cpp
@@ -25,9 +25,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3CUse.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <set>
 
diff --git a/src/V3Case.cpp b/src/V3Case.cpp
index c65fb3e7d..c8a2e639f 100644
--- a/src/V3Case.cpp
+++ b/src/V3Case.cpp
@@ -37,9 +37,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Case.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Stats.h"
 
 #include <algorithm>
diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp
index d0a26e6c9..fa5b748e9 100644
--- a/src/V3Cast.cpp
+++ b/src/V3Cast.cpp
@@ -40,9 +40,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Cast.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 
diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp
index acb305ab0..56e26ebe8 100644
--- a/src/V3Cdc.cpp
+++ b/src/V3Cdc.cpp
@@ -24,13 +24,14 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Cdc.h"
+
 #include "V3Ast.h"
-#include "V3Graph.h"
 #include "V3Const.h"
 #include "V3EmitV.h"
 #include "V3File.h"
+#include "V3Global.h"
+#include "V3Graph.h"
 
 #include <algorithm>
 #include <deque>
diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp
index bddcf76a7..32bf3d4c5 100644
--- a/src/V3Changed.cpp
+++ b/src/V3Changed.cpp
@@ -29,10 +29,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3Ast.h"
 #include "V3Changed.h"
 
+#include "V3Ast.h"
+#include "V3Global.h"
+
 #include <algorithm>
 
 //######################################################################
diff --git a/src/V3Class.cpp b/src/V3Class.cpp
index f65fbfbf6..94f513802 100644
--- a/src/V3Class.cpp
+++ b/src/V3Class.cpp
@@ -23,9 +23,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Class.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 //######################################################################
 
diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp
index eaf7c1f39..3cca98d7f 100644
--- a/src/V3Clean.cpp
+++ b/src/V3Clean.cpp
@@ -26,9 +26,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Clean.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 
diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp
index a8b8f7006..d94728f35 100644
--- a/src/V3Clock.cpp
+++ b/src/V3Clock.cpp
@@ -30,9 +30,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Clock.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 
diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp
index b1db26b9b..8fa0edbeb 100644
--- a/src/V3Combine.cpp
+++ b/src/V3Combine.cpp
@@ -22,12 +22,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Combine.h"
-#include "V3DupFinder.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
 #include "V3AstUserAllocator.h"
+#include "V3DupFinder.h"
+#include "V3Global.h"
+#include "V3Stats.h"
 
 #include <list>
 #include <vector>
diff --git a/src/V3Common.cpp b/src/V3Common.cpp
index 7915126a4..0d5ca45f3 100644
--- a/src/V3Common.cpp
+++ b/src/V3Common.cpp
@@ -24,9 +24,10 @@
 #include "verilatedos.h"
 
 #include "V3Common.h"
+
 #include "V3Ast.h"
-#include "V3Global.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 
 //######################################################################
 // Common component builders
diff --git a/src/V3Config.cpp b/src/V3Config.cpp
index d27db65ca..5961bf7d0 100644
--- a/src/V3Config.cpp
+++ b/src/V3Config.cpp
@@ -17,9 +17,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3Config.h"
+
 #include "V3Global.h"
 #include "V3String.h"
-#include "V3Config.h"
 
 #include <map>
 #include <set>
@@ -33,7 +34,8 @@
 // as wildcards and are accessed by a resolved name. It rebuilds a name lookup
 // cache of resolved entities. Entities stored in this container need an update
 // function that takes a reference of this type to join multiple entities into one.
-template <typename T> class V3ConfigWildcardResolver {
+template <typename T>
+class V3ConfigWildcardResolver final {
     using Map = std::map<const std::string, T>;
 
     Map m_mapWildcard;  // Wildcard strings to entities
diff --git a/src/V3Config.h b/src/V3Config.h
index 80d1fb9f2..effe2da08 100644
--- a/src/V3Config.h
+++ b/src/V3Config.h
@@ -20,9 +20,9 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3Ast.h"
 #include "V3Error.h"
 #include "V3FileLine.h"
-#include "V3Ast.h"
 
 //######################################################################
 
diff --git a/src/V3Const.cpp b/src/V3Const.cpp
index 8a7670c14..31e9e6360 100644
--- a/src/V3Const.cpp
+++ b/src/V3Const.cpp
@@ -23,14 +23,15 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3String.h"
 #include "V3Const.h"
+
 #include "V3Ast.h"
-#include "V3Width.h"
+#include "V3Global.h"
 #include "V3Simulate.h"
 #include "V3Stats.h"
+#include "V3String.h"
 #include "V3UniqueNames.h"
+#include "V3Width.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp
index cac65eb31..ae4088f4f 100644
--- a/src/V3Coverage.cpp
+++ b/src/V3Coverage.cpp
@@ -27,9 +27,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Coverage.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <map>
 #include <unordered_map>
diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp
index 864e3b6fe..1b16971d6 100644
--- a/src/V3CoverageJoin.cpp
+++ b/src/V3CoverageJoin.cpp
@@ -20,9 +20,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3CoverageJoin.h"
+
 #include "V3DupFinder.h"
+#include "V3Global.h"
 #include "V3Stats.h"
 
 #include <vector>
diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp
index 8018e94e9..5c6c11fb4 100644
--- a/src/V3Dead.cpp
+++ b/src/V3Dead.cpp
@@ -36,9 +36,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Dead.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <map>
 #include <vector>
diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp
index 668fff8a4..ce06a16a2 100644
--- a/src/V3Delayed.cpp
+++ b/src/V3Delayed.cpp
@@ -51,9 +51,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Delayed.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Stats.h"
 
 #include <algorithm>
diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp
index 0c3b791e3..7b81e22ca 100644
--- a/src/V3Depth.cpp
+++ b/src/V3Depth.cpp
@@ -26,9 +26,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Depth.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3UniqueNames.h"
 
 #include <algorithm>
diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp
index 13ebc929c..22da37e91 100644
--- a/src/V3DepthBlock.cpp
+++ b/src/V3DepthBlock.cpp
@@ -23,10 +23,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3DepthBlock.h"
+
 #include "V3Ast.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 
 #include <algorithm>
 
diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp
index c43c0352f..4fe90837f 100644
--- a/src/V3Descope.cpp
+++ b/src/V3Descope.cpp
@@ -25,10 +25,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Descope.h"
+
 #include "V3Ast.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 
 #include <map>
 
diff --git a/src/V3DupFinder.cpp b/src/V3DupFinder.cpp
index 809c06670..17c498646 100644
--- a/src/V3DupFinder.cpp
+++ b/src/V3DupFinder.cpp
@@ -17,10 +17,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3DupFinder.h"
+
 #include "V3Ast.h"
 #include "V3File.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <iomanip>
diff --git a/src/V3DupFinder.h b/src/V3DupFinder.h
index 1ee51a992..3853fa35f 100644
--- a/src/V3DupFinder.h
+++ b/src/V3DupFinder.h
@@ -23,8 +23,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 #include "V3Hasher.h"
 
 #include <map>
diff --git a/src/V3EmitCBase.cpp b/src/V3EmitCBase.cpp
index 0fa62cc25..1e3e9383f 100644
--- a/src/V3EmitCBase.cpp
+++ b/src/V3EmitCBase.cpp
@@ -18,6 +18,7 @@
 #include "verilatedos.h"
 
 #include "V3EmitCBase.h"
+
 #include "V3Task.h"
 
 //######################################################################
diff --git a/src/V3EmitCBase.h b/src/V3EmitCBase.h
index 5f3f09f33..66b954f35 100644
--- a/src/V3EmitCBase.h
+++ b/src/V3EmitCBase.h
@@ -20,12 +20,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3File.h"
 #include "V3Ast.h"
+#include "V3File.h"
+#include "V3Global.h"
 
-#include <cstdarg>
 #include <cmath>
+#include <cstdarg>
 
 //######################################################################
 // Set user4p in all CFunc and Var to point to the containing AstNodeModule
diff --git a/src/V3EmitCConstPool.cpp b/src/V3EmitCConstPool.cpp
index 3b11b4236..2fd22ccc4 100644
--- a/src/V3EmitCConstPool.cpp
+++ b/src/V3EmitCConstPool.cpp
@@ -21,8 +21,8 @@
 #include "V3EmitCConstInit.h"
 #include "V3File.h"
 #include "V3Global.h"
-#include "V3String.h"
 #include "V3Stats.h"
+#include "V3String.h"
 
 #include <algorithm>
 #include <cinttypes>
diff --git a/src/V3EmitCFunc.cpp b/src/V3EmitCFunc.cpp
index b3a224c5c..8f97b1139 100644
--- a/src/V3EmitCFunc.cpp
+++ b/src/V3EmitCFunc.cpp
@@ -17,9 +17,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3EmitCFunc.h"
+
 #include "V3Global.h"
 #include "V3String.h"
-#include "V3EmitCFunc.h"
 #include "V3TSP.h"
 
 #include <map>
diff --git a/src/V3EmitCFunc.h b/src/V3EmitCFunc.h
index 31d1f5a11..9d863c7e5 100644
--- a/src/V3EmitCFunc.h
+++ b/src/V3EmitCFunc.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3EmitCConstInit.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3EmitCHeaders.cpp b/src/V3EmitCHeaders.cpp
index f0734f670..a32f261d0 100644
--- a/src/V3EmitCHeaders.cpp
+++ b/src/V3EmitCHeaders.cpp
@@ -17,9 +17,9 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3EmitC.h"
 #include "V3EmitCConstInit.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/src/V3EmitCImp.cpp b/src/V3EmitCImp.cpp
index c88648d3f..c6985dd30 100644
--- a/src/V3EmitCImp.cpp
+++ b/src/V3EmitCImp.cpp
@@ -17,10 +17,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3EmitC.h"
 #include "V3Ast.h"
+#include "V3EmitC.h"
 #include "V3EmitCFunc.h"
+#include "V3Global.h"
 #include "V3String.h"
 #include "V3UniqueNames.h"
 
diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp
index d2002bf0d..f9a667e25 100644
--- a/src/V3EmitCInlines.cpp
+++ b/src/V3EmitCInlines.cpp
@@ -17,9 +17,9 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3EmitC.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 #include "V3Stats.h"
 
 #include <map>
diff --git a/src/V3EmitCMain.cpp b/src/V3EmitCMain.cpp
index 6e0ee7674..c717b7751 100644
--- a/src/V3EmitCMain.cpp
+++ b/src/V3EmitCMain.cpp
@@ -17,10 +17,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
+#include "V3EmitCMain.h"
+
 #include "V3EmitC.h"
 #include "V3EmitCBase.h"
-#include "V3EmitCMain.h"
+#include "V3Global.h"
 
 #include <map>
 
diff --git a/src/V3EmitCMake.cpp b/src/V3EmitCMake.cpp
index db74dcce9..c053cc45a 100644
--- a/src/V3EmitCMake.cpp
+++ b/src/V3EmitCMake.cpp
@@ -17,11 +17,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3Os.h"
 #include "V3EmitCMake.h"
+
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 #include "V3HierBlock.h"
+#include "V3Os.h"
 
 #include <memory>
 
@@ -36,7 +37,8 @@ class CMakeEmitter final {
     // STATIC FUNCTIONS
 
     // Concatenate all strings in 'strs' with ' ' between them.
-    template <typename List> static string cmake_list(const List& strs) {
+    template <typename List>
+    static string cmake_list(const List& strs) {
         string s;
         if (strs.begin() != strs.end()) {
             s.append("\"");
diff --git a/src/V3EmitCModel.cpp b/src/V3EmitCModel.cpp
index 5ec26221f..28687c19c 100644
--- a/src/V3EmitCModel.cpp
+++ b/src/V3EmitCModel.cpp
@@ -17,9 +17,9 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3EmitC.h"
 #include "V3EmitCFunc.h"
+#include "V3Global.h"
 #include "V3UniqueNames.h"
 
 #include <algorithm>
diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp
index aaa920664..de8be89b6 100644
--- a/src/V3EmitCSyms.cpp
+++ b/src/V3EmitCSyms.cpp
@@ -17,9 +17,9 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3EmitC.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 #include "V3LanguageWords.h"
 #include "V3PartitionGraph.h"
 
diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp
index 75dabd3ff..e4db53ede 100644
--- a/src/V3EmitMk.cpp
+++ b/src/V3EmitMk.cpp
@@ -17,11 +17,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3EmitMk.h"
+
+#include "V3EmitCBase.h"
 #include "V3Global.h"
 #include "V3HierBlock.h"
 #include "V3Os.h"
-#include "V3EmitMk.h"
-#include "V3EmitCBase.h"
 
 //######################################################################
 // Emit statements and math operators
diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp
index 82015f46d..940277a8d 100644
--- a/src/V3EmitV.cpp
+++ b/src/V3EmitV.cpp
@@ -17,9 +17,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3EmitV.h"
+
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp
index d77a959ad..933f27079 100644
--- a/src/V3EmitXml.cpp
+++ b/src/V3EmitXml.cpp
@@ -17,10 +17,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3EmitXml.h"
+
+#include "V3EmitCBase.h"
 #include "V3Global.h"
 #include "V3String.h"
-#include "V3EmitXml.h"
-#include "V3EmitCBase.h"
 
 #include <map>
 #include <vector>
diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp
index c10c3c85f..6e8e2c1ec 100644
--- a/src/V3Expand.cpp
+++ b/src/V3Expand.cpp
@@ -28,11 +28,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Expand.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
 #include "V3Const.h"
+#include "V3Global.h"
+#include "V3Stats.h"
 
 #include <algorithm>
 
diff --git a/src/V3File.cpp b/src/V3File.cpp
index b19d1f868..63f264b57 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -17,11 +17,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3File.h"
+
+#include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Os.h"
 #include "V3String.h"
-#include "V3Ast.h"
 
 #include <cerrno>
 #include <cstdarg>
@@ -29,6 +30,7 @@
 #include <iomanip>
 #include <map>
 #include <memory>
+
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/src/V3File.h b/src/V3File.h
index 6a4ded0de..91bfa90f9 100644
--- a/src/V3File.h
+++ b/src/V3File.h
@@ -23,12 +23,12 @@
 #include "V3Error.h"
 
 #include <array>
-#include <stack>
-#include <set>
-#include <list>
-#include <vector>
 #include <fstream>
+#include <list>
 #include <memory>
+#include <set>
+#include <stack>
+#include <vector>
 
 //============================================================================
 // V3File: Create streams, recording dependency information
diff --git a/src/V3FileLine.h b/src/V3FileLine.h
index d49d5e44a..f16bc5bca 100644
--- a/src/V3FileLine.h
+++ b/src/V3FileLine.h
@@ -23,12 +23,12 @@
 #include "V3Error.h"
 #include "V3LangCode.h"
 
-#include <sstream>
 #include <bitset>
+#include <deque>
 #include <map>
 #include <memory>
 #include <set>
-#include <deque>
+#include <sstream>
 
 //######################################################################
 
diff --git a/src/V3Force.cpp b/src/V3Force.cpp
index 2c21b842c..ea4c61a02 100644
--- a/src/V3Force.cpp
+++ b/src/V3Force.cpp
@@ -40,11 +40,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
-#include "V3Global.h"
 #include "V3Force.h"
 
 #include "V3AstUserAllocator.h"
+#include "V3Error.h"
+#include "V3Global.h"
 
 //######################################################################
 // Convert force/release statements and signals marked 'forceable'
diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp
index 4073c5462..88a9332d4 100644
--- a/src/V3Gate.cpp
+++ b/src/V3Gate.cpp
@@ -24,14 +24,15 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Gate.h"
+
 #include "V3Ast.h"
 #include "V3AstUserAllocator.h"
-#include "V3Graph.h"
 #include "V3Const.h"
-#include "V3Stats.h"
 #include "V3DupFinder.h"
+#include "V3Global.h"
+#include "V3Graph.h"
+#include "V3Stats.h"
 
 #include <algorithm>
 #include <list>
diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp
index a358ca2aa..dd3985b6f 100644
--- a/src/V3GenClk.cpp
+++ b/src/V3GenClk.cpp
@@ -22,9 +22,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3GenClk.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 //######################################################################
 // GenClk state, as a visitor of each AstNode
diff --git a/src/V3Global.cpp b/src/V3Global.cpp
index cb42337e4..c52243d74 100644
--- a/src/V3Global.cpp
+++ b/src/V3Global.cpp
@@ -18,6 +18,7 @@
 #include "verilatedos.h"
 
 #include "V3Global.h"
+
 #include "V3Ast.h"
 #include "V3File.h"
 #include "V3HierBlock.h"
diff --git a/src/V3Global.h b/src/V3Global.h
index a7b54e866..1341332f5 100644
--- a/src/V3Global.h
+++ b/src/V3Global.h
@@ -48,7 +48,8 @@ class V3HierBlockPlan;
 
 // Object used by VL_RESTORER.  This object must be an auto variable, not
 // allocated on the heap or otherwise.
-template <typename T> class VRestorer {
+template <typename T>
+class VRestorer final {
     T& m_ref;  // Reference to object we're saving and restoring
     const T m_saved;  // Value saved, for later restore
 
diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp
index 9bb30a6d0..1c4169e7a 100644
--- a/src/V3Graph.cpp
+++ b/src/V3Graph.cpp
@@ -17,10 +17,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3File.h"
 #include "V3Graph.h"
 
+#include "V3File.h"
+#include "V3Global.h"
+
 #include <map>
 #include <memory>
 #include <unordered_map>
diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp
index 9d4aa776f..c5e7dcec9 100644
--- a/src/V3GraphAlg.cpp
+++ b/src/V3GraphAlg.cpp
@@ -17,14 +17,15 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3GraphAlg.h"
+
+#include "V3Global.h"
 #include "V3GraphPathChecker.h"
 
 #include <algorithm>
-#include <vector>
-#include <map>
 #include <list>
+#include <map>
+#include <vector>
 
 //######################################################################
 //######################################################################
diff --git a/src/V3GraphPathChecker.cpp b/src/V3GraphPathChecker.cpp
index a88ab6221..6f40a9aa7 100644
--- a/src/V3GraphPathChecker.cpp
+++ b/src/V3GraphPathChecker.cpp
@@ -17,10 +17,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3GraphStream.h"
-#include "V3Global.h"
 #include "V3GraphPathChecker.h"
 
+#include "V3Global.h"
+#include "V3GraphStream.h"
+
 //######################################################################
 // GraphPCNode
 
diff --git a/src/V3GraphStream.h b/src/V3GraphStream.h
index f05e9a37e..37d68ca31 100644
--- a/src/V3GraphStream.h
+++ b/src/V3GraphStream.h
@@ -39,7 +39,8 @@
 // not generally safe. If you want a raw pointer compare, see
 // GraphStreamUnordered below.
 
-template <class T_Compare> class GraphStream {
+template <class T_Compare>
+class GraphStream final {
 private:
     // TYPES
     class VxHolder final {
diff --git a/src/V3Hash.h b/src/V3Hash.h
index 8c4d75e08..13f86dd6d 100644
--- a/src/V3Hash.h
+++ b/src/V3Hash.h
@@ -55,12 +55,16 @@ public:
     bool operator<(const V3Hash& rh) const { return m_value < rh.m_value; }
 
     // '+' combines hashes
-    template <class T> V3Hash operator+(T that) const {
+    template <class T>
+    V3Hash operator+(T that) const {
         return V3Hash(combine(m_value, V3Hash(that).m_value));
     }
 
     // '+=' combines in place
-    template <class T> V3Hash& operator+=(T that) { return *this = *this + that; }
+    template <class T>
+    V3Hash& operator+=(T that) {
+        return *this = *this + that;
+    }
 };
 
 std::ostream& operator<<(std::ostream& os, const V3Hash& rhs);
diff --git a/src/V3Hasher.h b/src/V3Hasher.h
index 57e3176a0..9944f84b1 100644
--- a/src/V3Hasher.h
+++ b/src/V3Hasher.h
@@ -23,8 +23,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 #include "V3Hash.h"
 
 //============================================================================
diff --git a/src/V3HierBlock.cpp b/src/V3HierBlock.cpp
index 2430e19db..ef45c5bd9 100644
--- a/src/V3HierBlock.cpp
+++ b/src/V3HierBlock.cpp
@@ -72,18 +72,19 @@
 //       Used for b) and c).
 //       This options is repeated for all instantiating hierarchical blocks.
 
-#include <memory>
-#include <sstream>
-#include <utility>
-#include <vector>
+#include "V3HierBlock.h"
 
 #include "V3Ast.h"
 #include "V3Error.h"
 #include "V3File.h"
-#include "V3HierBlock.h"
 #include "V3Os.h"
-#include "V3String.h"
 #include "V3Stats.h"
+#include "V3String.h"
+
+#include <memory>
+#include <sstream>
+#include <utility>
+#include <vector>
 
 static string V3HierCommandArgsFileName(const string& prefix, bool forCMake) {
     return v3Global.opt.makeDir() + "/" + prefix
diff --git a/src/V3HierBlock.h b/src/V3HierBlock.h
index c247dce52..b4fe14374 100644
--- a/src/V3HierBlock.h
+++ b/src/V3HierBlock.h
@@ -28,9 +28,9 @@
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 class AstNetlist;
diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp
index de62ca20d..6ab1daf9d 100644
--- a/src/V3Inline.cpp
+++ b/src/V3Inline.cpp
@@ -27,15 +27,15 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Inline.h"
+
+#include "V3Ast.h"
+#include "V3AstUserAllocator.h"
+#include "V3Global.h"
 #include "V3Inst.h"
 #include "V3Stats.h"
-#include "V3Ast.h"
 #include "V3String.h"
 
-#include "V3AstUserAllocator.h"
-
 #include <algorithm>
 #include <unordered_set>
 #include <vector>
diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp
index 339a5e0a5..e66936eec 100644
--- a/src/V3Inst.cpp
+++ b/src/V3Inst.cpp
@@ -24,10 +24,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Inst.h"
+
 #include "V3Ast.h"
 #include "V3Const.h"
+#include "V3Global.h"
 
 #include <algorithm>
 
diff --git a/src/V3InstrCount.cpp b/src/V3InstrCount.cpp
index a517bee15..d0ec37562 100644
--- a/src/V3InstrCount.cpp
+++ b/src/V3InstrCount.cpp
@@ -18,9 +18,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Ast.h"
 #include "V3InstrCount.h"
 
+#include "V3Ast.h"
+
 #include <iomanip>
 
 /// Estimate the instruction cost for executing all logic within and below
diff --git a/src/V3LangCode.h b/src/V3LangCode.h
index 5fa1b133e..3877dcf3d 100644
--- a/src/V3LangCode.h
+++ b/src/V3LangCode.h
@@ -20,9 +20,9 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include <vector>
 #include <map>
 #include <set>
+#include <vector>
 
 //######################################################################
 //! Class for the different languages supported.
diff --git a/src/V3Life.cpp b/src/V3Life.cpp
index 57ab26d63..112c3920e 100644
--- a/src/V3Life.cpp
+++ b/src/V3Life.cpp
@@ -26,11 +26,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Life.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
 #include "V3Const.h"
+#include "V3Global.h"
+#include "V3Stats.h"
 
 #include <map>
 #include <vector>
diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp
index 14405ee3d..51b2e0e2c 100644
--- a/src/V3LifePost.cpp
+++ b/src/V3LifePost.cpp
@@ -27,12 +27,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3PartitionGraph.h"
-#include "V3GraphPathChecker.h"
 #include "V3LifePost.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
+#include "V3GraphPathChecker.h"
+#include "V3PartitionGraph.h"
+#include "V3Stats.h"
 
 #include <memory>  // for std::unique_ptr -> auto_ptr or unique_ptr
 #include <unordered_map>
diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp
index da4dabaa4..ec0da2f09 100644
--- a/src/V3LinkCells.cpp
+++ b/src/V3LinkCells.cpp
@@ -26,17 +26,18 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3LinkCells.h"
-#include "V3SymTable.h"
-#include "V3Parse.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Graph.h"
+#include "V3Parse.h"
+#include "V3SymTable.h"
 
 #include <algorithm>
 #include <map>
-#include <vector>
 #include <unordered_set>
+#include <vector>
 
 //######################################################################
 // Graph subclasses
diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp
index 7c0d5269b..45e5a2038 100644
--- a/src/V3LinkDot.cpp
+++ b/src/V3LinkDot.cpp
@@ -64,12 +64,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3LinkDot.h"
-#include "V3SymTable.h"
-#include "V3Graph.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
+#include "V3Graph.h"
 #include "V3String.h"
+#include "V3SymTable.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3LinkDot.h b/src/V3LinkDot.h
index 08c4bc2ec..260c8cbcf 100644
--- a/src/V3LinkDot.h
+++ b/src/V3LinkDot.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 
 //============================================================================
 
diff --git a/src/V3LinkInc.cpp b/src/V3LinkInc.cpp
index f21764919..66dcbf8e1 100644
--- a/src/V3LinkInc.cpp
+++ b/src/V3LinkInc.cpp
@@ -39,9 +39,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3LinkInc.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 
diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp
index f7f68c28a..9b85ac6f6 100644
--- a/src/V3LinkJump.cpp
+++ b/src/V3LinkJump.cpp
@@ -32,9 +32,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3LinkJump.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp
index 1f955e361..0e8f4ed65 100644
--- a/src/V3LinkLValue.cpp
+++ b/src/V3LinkLValue.cpp
@@ -21,9 +21,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3LinkLValue.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <map>
 
diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp
index d96892762..b9ecca249 100644
--- a/src/V3LinkLevel.cpp
+++ b/src/V3LinkLevel.cpp
@@ -22,9 +22,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3LinkLevel.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3LinkLevel.h b/src/V3LinkLevel.h
index 49e56254b..6a9ecdd11 100644
--- a/src/V3LinkLevel.h
+++ b/src/V3LinkLevel.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 
 #include <vector>
 
diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp
index 67d82b7fb..2acc01f3e 100644
--- a/src/V3LinkParse.cpp
+++ b/src/V3LinkParse.cpp
@@ -21,10 +21,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3LinkParse.h"
+
 #include "V3Ast.h"
 #include "V3Config.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp
index a20100a80..f1b859b51 100644
--- a/src/V3LinkResolve.cpp
+++ b/src/V3LinkResolve.cpp
@@ -27,10 +27,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3LinkResolve.h"
+
+#include "V3Ast.h"
 #include "V3Global.h"
 #include "V3String.h"
-#include "V3LinkResolve.h"
-#include "V3Ast.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3List.h b/src/V3List.h
index 7871cd282..883db89af 100644
--- a/src/V3List.h
+++ b/src/V3List.h
@@ -24,10 +24,13 @@
 
 //============================================================================
 
-template <class T> class V3List;
-template <class T> class V3ListEnt;
+template <class T>
+class V3List;
+template <class T>
+class V3ListEnt;
 
-template <class T> class V3List {
+template <class T>
+class V3List final {
     // List container for linked list of elements of type *T  (T is a pointer type)
 private:
     // MEMBERS
@@ -50,7 +53,8 @@ public:
 
 //============================================================================
 
-template <class T> class V3ListEnt {
+template <class T>
+class V3ListEnt final {
     // List entry for linked list of elements of type *T  (T is a pointer type)
 private:
     // MEMBERS
diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp
index c121d5387..27d652110 100644
--- a/src/V3Localize.cpp
+++ b/src/V3Localize.cpp
@@ -25,11 +25,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Localize.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
 #include "V3AstUserAllocator.h"
+#include "V3Global.h"
+#include "V3Stats.h"
 
 #include <vector>
 
diff --git a/src/V3MergeCond.cpp b/src/V3MergeCond.cpp
index 74dfaecb1..bb3389861 100644
--- a/src/V3MergeCond.cpp
+++ b/src/V3MergeCond.cpp
@@ -75,13 +75,14 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3MergeCond.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
 #include "V3AstUserAllocator.h"
-#include "V3Hasher.h"
 #include "V3DupFinder.h"
+#include "V3Global.h"
+#include "V3Hasher.h"
+#include "V3Stats.h"
 
 #include <queue>
 #include <set>
diff --git a/src/V3Name.cpp b/src/V3Name.cpp
index 73e0a1839..d958c1ddb 100644
--- a/src/V3Name.cpp
+++ b/src/V3Name.cpp
@@ -22,9 +22,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Name.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3LanguageWords.h"
 
 //######################################################################
diff --git a/src/V3Number.cpp b/src/V3Number.cpp
index 801d98c2d..9ff6bf5b1 100644
--- a/src/V3Number.cpp
+++ b/src/V3Number.cpp
@@ -17,9 +17,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Number.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <cerrno>
diff --git a/src/V3Number_test.cpp b/src/V3Number_test.cpp
index f7dc63484..9aa4ba26c 100644
--- a/src/V3Number_test.cpp
+++ b/src/V3Number_test.cpp
@@ -18,7 +18,7 @@
 #define V3NUMBER_ASCII_BINARY
 #define V3ERROR_NO_GLOBAL_
 
-#include <config_build.h>
+#include "config_build.h"
 #include "verilatedos.h"
 
 #include "V3Error.cpp"
diff --git a/src/V3OptionParser.cpp b/src/V3OptionParser.cpp
index d98b4fd90..f9d5c721d 100644
--- a/src/V3OptionParser.cpp
+++ b/src/V3OptionParser.cpp
@@ -48,12 +48,16 @@ struct V3OptionParser::Impl {
     };
 
     // Actual action classes
-    template <typename T> class ActionSet;  // "-opt" for bool-ish, "-opt val" for int and string
-    template <typename BOOL> class ActionFOnOff;  // "-fopt" and "-fno-opt" for bool-ish
-    template <typename BOOL> class ActionOnOff;  // "-opt" and "-no-opt" for bool-ish
+    template <typename T>
+    class ActionSet;  // "-opt" for bool-ish, "-opt val" for int and string
+    template <typename BOOL>
+    class ActionFOnOff;  // "-fopt" and "-fno-opt" for bool-ish
+    template <typename BOOL>
+    class ActionOnOff;  // "-opt" and "-no-opt" for bool-ish
     class ActionCbCall;  // Callback without argument for "-opt"
     class ActionCbOnOff;  // Callback for "-opt" and "-no-opt"
-    template <class T> class ActionCbVal;  // Callback for "-opt val"
+    template <class T>
+    class ActionCbVal;  // Callback for "-opt val"
     class ActionCbPartialMatch;  // Callback "-O3" for "-O"
     class ActionCbPartialMatchVal;  // Callback "-debugi-V3Options 3" for "-debugi-"
 
@@ -67,7 +71,8 @@ struct V3OptionParser::Impl {
 // Action classes in V3OptionParser::Impl
 
 #define V3OPTION_PARSER_DEF_ACT_CLASS(className, type, body, enType) \
-    template <> class V3OptionParser::Impl::className<type> final : public ActionBase<enType> { \
+    template <> \
+    class V3OptionParser::Impl::className<type> final : public ActionBase<enType> { \
         type* const m_valp; /* Pointer to a option variable*/ \
 \
     public: \
diff --git a/src/V3OptionParser.h b/src/V3OptionParser.h
index e77f43a26..2c5dbf6fb 100644
--- a/src/V3OptionParser.h
+++ b/src/V3OptionParser.h
@@ -65,7 +65,8 @@ private:
 
     // METHODS
     ActionIfs* find(const char* optp);
-    template <class ACT, class ARG> ActionIfs& add(const string& opt, ARG arg);
+    template <class ACT, class ARG>
+    ActionIfs& add(const string& opt, ARG arg);
     static bool hasPrefixFNo(const char* strp);  // Returns true if strp starts with "-fno"
     static bool hasPrefixNo(const char* strp);  // Returns true if strp starts with "-no"
 
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index d54b96c11..8ef8038b6 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -17,13 +17,14 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3Ast.h"
-#include "V3Os.h"
 #include "V3Options.h"
-#include "V3OptionParser.h"
+
+#include "V3Ast.h"
 #include "V3Error.h"
 #include "V3File.h"
+#include "V3Global.h"
+#include "V3OptionParser.h"
+#include "V3Os.h"
 #include "V3PreShell.h"
 #include "V3String.h"
 
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index 311b4a381..1d83983ea 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -79,6 +79,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3Order.h"
+
 #include "V3Ast.h"
 #include "V3AstUserAllocator.h"
 #include "V3Const.h"
@@ -88,24 +90,22 @@
 #include "V3Graph.h"
 #include "V3GraphStream.h"
 #include "V3List.h"
+#include "V3OrderGraph.h"
 #include "V3Partition.h"
 #include "V3PartitionGraph.h"
 #include "V3SenTree.h"
 #include "V3SplitVar.h"
 #include "V3Stats.h"
 
-#include "V3Order.h"
-#include "V3OrderGraph.h"
-
 #include <algorithm>
 #include <deque>
 #include <iomanip>
 #include <map>
 #include <memory>
 #include <sstream>
-#include <vector>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 //######################################################################
 // Utilities
@@ -824,7 +824,8 @@ inline std::ostream& operator<<(std::ostream& lhs, const OrderMoveDomScope& rhs)
 //######################################################################
 // ProcessMoveBuildGraph
 
-template <class T_MoveVertex> class ProcessMoveBuildGraph {
+template <class T_MoveVertex>
+class ProcessMoveBuildGraph final {
     // ProcessMoveBuildGraph takes as input the fine-grained graph of
     // OrderLogicVertex, OrderVarVertex, etc; this is 'm_graph' in
     // OrderVisitor. It produces a slightly coarsened graph to drive the
diff --git a/src/V3Param.cpp b/src/V3Param.cpp
index 610bdba9a..8a2b5a415 100644
--- a/src/V3Param.cpp
+++ b/src/V3Param.cpp
@@ -47,16 +47,17 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Param.h"
+
 #include "V3Ast.h"
 #include "V3Case.h"
 #include "V3Const.h"
+#include "V3Global.h"
+#include "V3Hasher.h"
 #include "V3Os.h"
 #include "V3Parse.h"
-#include "V3Width.h"
 #include "V3Unroll.h"
-#include "V3Hasher.h"
+#include "V3Width.h"
 
 #include <cctype>
 #include <deque>
diff --git a/src/V3ParseImp.cpp b/src/V3ParseImp.cpp
index 6eb40cf7c..924a5062b 100644
--- a/src/V3ParseImp.cpp
+++ b/src/V3ParseImp.cpp
@@ -25,16 +25,16 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
-#include "V3Global.h"
-#include "V3Os.h"
-#include "V3Ast.h"
-#include "V3File.h"
 #include "V3ParseImp.h"
-#include "V3PreShell.h"
-#include "V3LanguageWords.h"
 
+#include "V3Ast.h"
+#include "V3Error.h"
+#include "V3File.h"
+#include "V3Global.h"
+#include "V3LanguageWords.h"
+#include "V3Os.h"
 #include "V3ParseBison.h"  // Generated by bison
+#include "V3PreShell.h"
 
 #include <sstream>
 
diff --git a/src/V3Partition.cpp b/src/V3Partition.cpp
index d9a071a96..b410b9bea 100644
--- a/src/V3Partition.cpp
+++ b/src/V3Partition.cpp
@@ -17,14 +17,15 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3EmitCBase.h"
+#include "V3Partition.h"
+
 #include "V3Config.h"
-#include "V3Os.h"
+#include "V3EmitCBase.h"
 #include "V3File.h"
 #include "V3GraphAlg.h"
 #include "V3GraphStream.h"
 #include "V3InstrCount.h"
-#include "V3Partition.h"
+#include "V3Os.h"
 #include "V3PartitionGraph.h"
 #include "V3Scoreboard.h"
 #include "V3Stats.h"
@@ -160,7 +161,8 @@ static void partCheckCachedScoreVsActual(uint32_t cached, uint32_t actual) {
 //  * Client calls PartPropagateCp::go(). Internally, this iteratively
 //    propagates the new CPs wayward through the graph.
 //
-template <class T_CostAccessor> class PartPropagateCp : GraphAlg<> {
+template <class T_CostAccessor>
+class PartPropagateCp final : GraphAlg<> {
 private:
     // MEMBERS
     const GraphWay m_way;  // CPs oriented in this direction: either FORWARD
diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp
index 7dfeb9c12..33fffc337 100644
--- a/src/V3PreProc.cpp
+++ b/src/V3PreProc.cpp
@@ -17,12 +17,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3PreProc.h"
+
 #include "V3Error.h"
-#include "V3Global.h"
 #include "V3File.h"
+#include "V3Global.h"
 #include "V3LanguageWords.h"
 #include "V3PreLex.h"
-#include "V3PreProc.h"
 #include "V3PreShell.h"
 #include "V3String.h"
 
diff --git a/src/V3PreProc.h b/src/V3PreProc.h
index 17b8d202f..f446a4f35 100644
--- a/src/V3PreProc.h
+++ b/src/V3PreProc.h
@@ -24,9 +24,9 @@
 #include "V3FileLine.h"
 #include "V3Global.h"
 
-#include <map>
-#include <list>
 #include <iostream>
+#include <list>
+#include <map>
 
 // Compatibility with Verilog-Perl's preprocessor
 #define fatalSrc(msg) v3fatalSrc(msg)
diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp
index 4b817a53b..752ce3b8b 100644
--- a/src/V3PreShell.cpp
+++ b/src/V3PreShell.cpp
@@ -17,12 +17,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3PreShell.h"
-#include "V3PreProc.h"
+
 #include "V3File.h"
-#include "V3Parse.h"
+#include "V3Global.h"
 #include "V3Os.h"
+#include "V3Parse.h"
+#include "V3PreProc.h"
 
 #include <algorithm>
 #include <iostream>
diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp
index 936395f9d..e10f13458 100644
--- a/src/V3Premit.cpp
+++ b/src/V3Premit.cpp
@@ -27,9 +27,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Premit.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Stats.h"
 #include "V3UniqueNames.h"
 
diff --git a/src/V3ProtectLib.cpp b/src/V3ProtectLib.cpp
index c89d9ce5c..1012b25eb 100644
--- a/src/V3ProtectLib.cpp
+++ b/src/V3ProtectLib.cpp
@@ -17,10 +17,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3String.h"
 #include "V3ProtectLib.h"
+
+#include "V3Global.h"
 #include "V3Hasher.h"
+#include "V3String.h"
 #include "V3Task.h"
 
 #include <list>
diff --git a/src/V3Randomize.cpp b/src/V3Randomize.cpp
index dbcdbd9ed..0ac20c3b7 100644
--- a/src/V3Randomize.cpp
+++ b/src/V3Randomize.cpp
@@ -27,9 +27,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Ast.h"
 #include "V3Randomize.h"
 
+#include "V3Ast.h"
+
 //######################################################################
 // Visitor that marks classes needing a randomize() method
 
diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp
index 3186b182a..6851717c9 100644
--- a/src/V3Reloop.cpp
+++ b/src/V3Reloop.cpp
@@ -32,10 +32,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Reloop.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
+#include "V3Stats.h"
 
 #include <algorithm>
 
diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp
index 576931d75..aa0915815 100644
--- a/src/V3Scope.cpp
+++ b/src/V3Scope.cpp
@@ -24,9 +24,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Scope.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3Scoreboard.h b/src/V3Scoreboard.h
index 43d5be804..dc5fce0b0 100644
--- a/src/V3Scoreboard.h
+++ b/src/V3Scoreboard.h
@@ -112,7 +112,7 @@ public:
     // Returns const reference.
     const T_Value& at(const T_Key& key) const { return m_kiMap.at(key)->second; }
     // Note this returns const_iterator
-    template <typename... Args>  //
+    template <typename... Args>
     std::pair<const_iterator, bool> emplace(const T_Key& key, Args&&... args) {
         const auto kiEmp = m_kiMap.emplace(key, end());
         if (kiEmp.second) {
diff --git a/src/V3Simulate.h b/src/V3Simulate.h
index 378cdd0e4..e2418e60d 100644
--- a/src/V3Simulate.h
+++ b/src/V3Simulate.h
@@ -35,10 +35,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
-#include "V3Width.h"
+#include "V3Error.h"
 #include "V3Task.h"
+#include "V3Width.h"
 
 #include <deque>
 #include <sstream>
diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp
index a70aabde1..94a70fe99 100644
--- a/src/V3Slice.cpp
+++ b/src/V3Slice.cpp
@@ -38,9 +38,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Slice.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 //*************************************************************************
 
diff --git a/src/V3Split.cpp b/src/V3Split.cpp
index bd3355fb5..83dc6ac5b 100644
--- a/src/V3Split.cpp
+++ b/src/V3Split.cpp
@@ -80,17 +80,18 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Split.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Graph.h"
+#include "V3Stats.h"
 
 #include <algorithm>
 #include <map>
-#include <vector>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 //######################################################################
 // Support classes
diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp
index caea1a33a..ebdac1d7a 100644
--- a/src/V3SplitAs.cpp
+++ b/src/V3SplitAs.cpp
@@ -24,10 +24,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3SplitAs.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
+#include "V3Stats.h"
 
 #include <map>
 
diff --git a/src/V3SplitVar.cpp b/src/V3SplitVar.cpp
index 193b0e061..7ca9464d0 100644
--- a/src/V3SplitVar.cpp
+++ b/src/V3SplitVar.cpp
@@ -113,9 +113,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3SplitVar.h"
+
 #include "V3Ast.h"
 #include "V3Global.h"
-#include "V3SplitVar.h"
 #include "V3Stats.h"
 #include "V3UniqueNames.h"
 
diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp
index 4eeda8e53..7eb07363e 100644
--- a/src/V3Stats.cpp
+++ b/src/V3Stats.cpp
@@ -17,9 +17,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Stats.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
 
 // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators
 #include "V3AstConstOnly.h"
diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp
index 86dfe15f7..ad12bd812 100644
--- a/src/V3StatsReport.cpp
+++ b/src/V3StatsReport.cpp
@@ -17,11 +17,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3Stats.h"
 #include "V3Ast.h"
 #include "V3File.h"
+#include "V3Global.h"
 #include "V3Os.h"
+#include "V3Stats.h"
 
 #include <iomanip>
 #include <map>
diff --git a/src/V3String.cpp b/src/V3String.cpp
index dcdb0a042..9d20bd078 100644
--- a/src/V3String.cpp
+++ b/src/V3String.cpp
@@ -18,8 +18,8 @@
 #include "verilatedos.h"
 
 // Limited V3 headers here - this is a base class for Vlc etc
-#include "V3String.h"
 #include "V3Error.h"
+#include "V3String.h"
 
 #include <algorithm>
 
diff --git a/src/V3String.h b/src/V3String.h
index fd349f9ae..0da8bdfc7 100644
--- a/src/V3String.h
+++ b/src/V3String.h
@@ -33,7 +33,8 @@
 //######################################################################
 // Global string-related functions
 
-template <class T> std::string cvtToStr(const T& t) {
+template <class T>
+std::string cvtToStr(const T& t) {
     std::ostringstream os;
     os << t;
     return os.str();
diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp
index ff8122533..ef7562ac5 100644
--- a/src/V3Subst.cpp
+++ b/src/V3Subst.cpp
@@ -25,10 +25,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Subst.h"
-#include "V3Stats.h"
+
 #include "V3Ast.h"
+#include "V3Global.h"
+#include "V3Stats.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/src/V3SymTable.h b/src/V3SymTable.h
index a594a4541..c1607f5f4 100644
--- a/src/V3SymTable.h
+++ b/src/V3SymTable.h
@@ -20,9 +20,9 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Ast.h"
 #include "V3File.h"
+#include "V3Global.h"
 #include "V3String.h"
 
 #include <cstdarg>
diff --git a/src/V3TSP.cpp b/src/V3TSP.cpp
index db80fbb82..27d877369 100644
--- a/src/V3TSP.cpp
+++ b/src/V3TSP.cpp
@@ -22,20 +22,21 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
-#include "V3Global.h"
-#include "V3File.h"
-#include "V3Graph.h"
 #include "V3TSP.h"
 
+#include "V3Error.h"
+#include "V3File.h"
+#include "V3Global.h"
+#include "V3Graph.h"
+
 #include <algorithm>
 #include <cmath>
 #include <list>
 #include <memory>
 #include <sstream>
 #include <string>
-#include <unordered_set>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 //######################################################################
@@ -51,7 +52,8 @@ VL_DEBUG_FUNC;  // Declare debug()
 }  // namespace V3TSP
 
 // Vertex that tracks a per-vertex key
-template <typename T_Key> class TspVertexTmpl : public V3GraphVertex {
+template <typename T_Key>
+class TspVertexTmpl final : public V3GraphVertex {
 private:
     const T_Key m_key;
 
@@ -68,7 +70,8 @@ private:
 
 // TspGraphTmpl represents a complete graph, templatized to work with
 // different T_Key types.
-template <typename T_Key> class TspGraphTmpl : public V3Graph {
+template <typename T_Key>
+class TspGraphTmpl final : public V3Graph {
 public:
     // TYPES
     using Vertex = TspVertexTmpl<T_Key>;
diff --git a/src/V3Table.cpp b/src/V3Table.cpp
index 30a9cb587..e1f6cc2f0 100644
--- a/src/V3Table.cpp
+++ b/src/V3Table.cpp
@@ -24,11 +24,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Table.h"
+
+#include "V3Ast.h"
+#include "V3Global.h"
 #include "V3Simulate.h"
 #include "V3Stats.h"
-#include "V3Ast.h"
 
 #include <cmath>
 #include <vector>
diff --git a/src/V3Task.cpp b/src/V3Task.cpp
index 0e150d31f..c736bb86b 100644
--- a/src/V3Task.cpp
+++ b/src/V3Task.cpp
@@ -26,11 +26,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3Const.h"
 #include "V3Task.h"
+
 #include "V3Ast.h"
+#include "V3Const.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 #include "V3Graph.h"
 #include "V3LinkLValue.h"
 
diff --git a/src/V3Task.h b/src/V3Task.h
index 33e11512d..a2ae41769 100644
--- a/src/V3Task.h
+++ b/src/V3Task.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 
 #include <utility>
 #include <vector>
diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp
index c8a665f3e..b6fbb95ce 100644
--- a/src/V3Trace.cpp
+++ b/src/V3Trace.cpp
@@ -38,15 +38,16 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Trace.h"
-#include "V3EmitCBase.h"
-#include "V3Graph.h"
+
 #include "V3DupFinder.h"
+#include "V3EmitCBase.h"
+#include "V3Global.h"
+#include "V3Graph.h"
 #include "V3Stats.h"
 
-#include <map>
 #include <limits>
+#include <map>
 #include <set>
 
 //######################################################################
diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp
index 09c2ac8f5..3f9c1ae6a 100644
--- a/src/V3TraceDecl.cpp
+++ b/src/V3TraceDecl.cpp
@@ -22,13 +22,15 @@
 
 #include "config_build.h"
 #include "verilatedos.h"
+
+#include "V3TraceDecl.h"
+
 #include "verilated_trace_defs.h"  // For VLT_TRACE_SCOPE_*
 
-#include "V3Global.h"
 #include "V3Config.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 #include "V3Stats.h"
-#include "V3TraceDecl.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp
index da76ddb17..6f80c2f82 100644
--- a/src/V3Tristate.cpp
+++ b/src/V3Tristate.cpp
@@ -60,12 +60,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Tristate.h"
+
 #include "V3Ast.h"
-#include "V3Stats.h"
-#include "V3Inst.h"
+#include "V3Global.h"
 #include "V3Graph.h"
+#include "V3Inst.h"
+#include "V3Stats.h"
 
 #include <algorithm>
 #include <map>
diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp
index dc8283469..0732dafa1 100644
--- a/src/V3Undriven.cpp
+++ b/src/V3Undriven.cpp
@@ -26,10 +26,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
+#include "V3Undriven.h"
+
+#include "V3Ast.h"
 #include "V3Global.h"
 #include "V3String.h"
-#include "V3Undriven.h"
-#include "V3Ast.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp
index 0df1ff3a6..12f011366 100644
--- a/src/V3Unknown.cpp
+++ b/src/V3Unknown.cpp
@@ -31,10 +31,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Unknown.h"
+
 #include "V3Ast.h"
 #include "V3Const.h"
+#include "V3Global.h"
 #include "V3Stats.h"
 #include "V3UniqueNames.h"
 
diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp
index 469f5656e..719f3cbc0 100644
--- a/src/V3Unroll.cpp
+++ b/src/V3Unroll.cpp
@@ -27,12 +27,13 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Unroll.h"
-#include "V3Stats.h"
-#include "V3Const.h"
+
 #include "V3Ast.h"
+#include "V3Const.h"
+#include "V3Global.h"
 #include "V3Simulate.h"
+#include "V3Stats.h"
 
 #include <algorithm>
 
diff --git a/src/V3Unroll.h b/src/V3Unroll.h
index 91c5b3386..6cdece617 100644
--- a/src/V3Unroll.h
+++ b/src/V3Unroll.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 
 //============================================================================
 /// Unroller with saved state, so caller can determine when pushDelete's are executed.
diff --git a/src/V3VariableOrder.cpp b/src/V3VariableOrder.cpp
index 6628cb7ed..6dda8290b 100644
--- a/src/V3VariableOrder.cpp
+++ b/src/V3VariableOrder.cpp
@@ -23,11 +23,12 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3VariableOrder.h"
+
 #include "V3Ast.h"
 #include "V3AstUserAllocator.h"
 #include "V3EmitCBase.h"
+#include "V3Global.h"
 #include "V3TSP.h"
 
 #include <algorithm>
diff --git a/src/V3Waiver.cpp b/src/V3Waiver.cpp
index 2e08c57c8..42d222fe8 100644
--- a/src/V3Waiver.cpp
+++ b/src/V3Waiver.cpp
@@ -15,9 +15,10 @@
 
 #include "verilatedos.h"
 
-#include "V3File.h"
 #include "V3Waiver.h"
 
+#include "V3File.h"
+
 #include <memory>
 #include <sstream>
 
diff --git a/src/V3Waiver.h b/src/V3Waiver.h
index 2203cc52b..ba714c6c9 100644
--- a/src/V3Waiver.h
+++ b/src/V3Waiver.h
@@ -19,8 +19,8 @@
 
 #include "V3Error.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 class V3Waiver final {
     // TYPES
diff --git a/src/V3Width.cpp b/src/V3Width.cpp
index f24380c2c..215e282b6 100644
--- a/src/V3Width.cpp
+++ b/src/V3Width.cpp
@@ -66,10 +66,11 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
 #include "V3Width.h"
-#include "V3Number.h"
+
 #include "V3Const.h"
+#include "V3Global.h"
+#include "V3Number.h"
 #include "V3Randomize.h"
 #include "V3String.h"
 #include "V3Task.h"
diff --git a/src/V3WidthCommit.h b/src/V3WidthCommit.h
index b4c745123..5b784387d 100644
--- a/src/V3WidthCommit.h
+++ b/src/V3WidthCommit.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Error.h"
 #include "V3Ast.h"
+#include "V3Error.h"
 
 // clang-format off
 #ifndef VERILATOR_V3WIDTH_CPP_
diff --git a/src/V3WidthSel.cpp b/src/V3WidthSel.cpp
index b4afe191a..d958f6d52 100644
--- a/src/V3WidthSel.cpp
+++ b/src/V3WidthSel.cpp
@@ -29,10 +29,10 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "V3Global.h"
-#include "V3Width.h"
 #include "V3Ast.h"
 #include "V3Const.h"
+#include "V3Global.h"
+#include "V3Width.h"
 
 //######################################################################
 // Width state, as a visitor of each AstNode
diff --git a/src/Verilator.cpp b/src/Verilator.cpp
index f28faabf6..b5d2df2cb 100644
--- a/src/Verilator.cpp
+++ b/src/Verilator.cpp
@@ -14,13 +14,11 @@
 //
 //*************************************************************************
 
-#include "V3Global.h"
-#include "V3Ast.h"
-
 #include "V3Active.h"
 #include "V3ActiveTop.h"
 #include "V3Assert.h"
 #include "V3AssertPre.h"
+#include "V3Ast.h"
 #include "V3Begin.h"
 #include "V3Branch.h"
 #include "V3Broken.h"
@@ -54,6 +52,7 @@
 #include "V3Force.h"
 #include "V3Gate.h"
 #include "V3GenClk.h"
+#include "V3Global.h"
 #include "V3Graph.h"
 #include "V3HierBlock.h"
 #include "V3Inline.h"
@@ -61,8 +60,8 @@
 #include "V3Life.h"
 #include "V3LifePost.h"
 #include "V3LinkDot.h"
-#include "V3LinkJump.h"
 #include "V3LinkInc.h"
+#include "V3LinkJump.h"
 #include "V3LinkLValue.h"
 #include "V3LinkLevel.h"
 #include "V3LinkParse.h"
diff --git a/src/VlcPoint.h b/src/VlcPoint.h
index f4bc6ffba..b5c9598fc 100644
--- a/src/VlcPoint.h
+++ b/src/VlcPoint.h
@@ -20,15 +20,16 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include <vector>
 #include <iomanip>
 #include <map>
 #include <unordered_map>
+#include <vector>
 
 #define V3ERROR_NO_GLOBAL_
-#include "V3Error.h"
 #include "verilated_cov_key.h"
 
+#include "V3Error.h"
+
 //********************************************************************
 // VlcPoint - A coverage point (across all tests)
 
diff --git a/src/VlcTest.h b/src/VlcTest.h
index d4717d16c..2c85950dc 100644
--- a/src/VlcTest.h
+++ b/src/VlcTest.h
@@ -20,8 +20,8 @@
 #include "config_build.h"
 #include "verilatedos.h"
 
-#include "VlcPoint.h"
 #include "VlcBucket.h"
+#include "VlcPoint.h"
 
 #include <map>
 #include <vector>
diff --git a/src/VlcTop.cpp b/src/VlcTop.cpp
index ba08eb6d0..fe94464ea 100644
--- a/src/VlcTop.cpp
+++ b/src/VlcTop.cpp
@@ -14,10 +14,12 @@
 //
 //*************************************************************************
 
+#include "VlcTop.h"
+
 #include "V3Error.h"
 #include "V3Os.h"
+
 #include "VlcOptions.h"
-#include "VlcTop.h"
 
 #include <algorithm>
 #include <fstream>
diff --git a/src/VlcTop.h b/src/VlcTop.h
index 2d9ccc39c..2f453b5ff 100644
--- a/src/VlcTop.h
+++ b/src/VlcTop.h
@@ -21,9 +21,9 @@
 #include "verilatedos.h"
 
 #include "VlcOptions.h"
-#include "VlcTest.h"
 #include "VlcPoint.h"
 #include "VlcSource.h"
+#include "VlcTest.h"
 
 //######################################################################
 // VlcTop - Top level options container
diff --git a/test_regress/t/TestSimulator.h b/test_regress/t/TestSimulator.h
index 2e0098e73..6272887d8 100644
--- a/test_regress/t/TestSimulator.h
+++ b/test_regress/t/TestSimulator.h
@@ -10,6 +10,7 @@
 //*************************************************************************
 
 #include "vpi_user.h"
+
 #include <sstream>
 
 class TestSimulator {
diff --git a/test_regress/t/t_const_bitoptree_bug3096.cpp b/test_regress/t/t_const_bitoptree_bug3096.cpp
index 27a3ca385..deb9e1ee9 100644
--- a/test_regress/t/t_const_bitoptree_bug3096.cpp
+++ b/test_regress/t/t_const_bitoptree_bug3096.cpp
@@ -9,11 +9,10 @@
 //
 //*************************************************************************
 
+#include <Vt_const_bitoptree_bug3096.h>
 #include <cassert>
 #include <iostream>
 
-#include <Vt_const_bitoptree_bug3096.h>
-
 int main(int argc, char* argv[]) {
     Vt_const_bitoptree_bug3096* const tb = new Vt_const_bitoptree_bug3096;
 
diff --git a/test_regress/t/t_cover_lib_1.out b/test_regress/t/t_cover_lib_1.out
index 919cea884..c6846d4cc 100644
--- a/test_regress/t/t_cover_lib_1.out
+++ b/test_regress/t/t_cover_lib_1.out
@@ -1,7 +1,7 @@
 # SystemC::Coverage-3
-C '
f../../t/t_cover_lib_c.cpp
l37
pagesp_user/t_cover_lib_c
P0
htop.a*.pi' 500
-C '
f../../t/t_cover_lib_c.cpp
l37
pagesp_user/t_cover_lib_c
P1
htop.a0.npi' 200
-C '
f../../t/t_cover_lib_c.cpp
l37
pagesp_user/t_cover_lib_c
P1
htop.a1.npi' 300
-C '
f../../t/t_cover_lib_c.cpp
l46
pagesp_user/t_cover_lib_c
okept_one
hmain' 100
-C '
f../../t/t_cover_lib_c.cpp
l47
pagesp_user/t_cover_lib_c
okept_two
hmain' 210
-C '
f../../t/t_cover_lib_c.cpp
l48
pagesp_user/t_cover_lib_c
olost_three
hmain' 220
+C '
f../../t/t_cover_lib_c.cpp
l39
pagesp_user/t_cover_lib_c
P0
htop.a*.pi' 500
+C '
f../../t/t_cover_lib_c.cpp
l39
pagesp_user/t_cover_lib_c
P1
htop.a0.npi' 200
+C '
f../../t/t_cover_lib_c.cpp
l39
pagesp_user/t_cover_lib_c
P1
htop.a1.npi' 300
+C '
f../../t/t_cover_lib_c.cpp
l48
pagesp_user/t_cover_lib_c
okept_one
hmain' 100
+C '
f../../t/t_cover_lib_c.cpp
l49
pagesp_user/t_cover_lib_c
okept_two
hmain' 210
+C '
f../../t/t_cover_lib_c.cpp
l50
pagesp_user/t_cover_lib_c
olost_three
hmain' 220
diff --git a/test_regress/t/t_cover_lib_1_per_instance.out b/test_regress/t/t_cover_lib_1_per_instance.out
index dd3dfec0d..8ed9d2b81 100644
--- a/test_regress/t/t_cover_lib_1_per_instance.out
+++ b/test_regress/t/t_cover_lib_1_per_instance.out
@@ -1,8 +1,8 @@
 # SystemC::Coverage-3
-C '
f../../t/t_cover_lib_c.cpp
l37
pagesp_user/t_cover_lib_c
P0
htop.a0.pi' 200
-C '
f../../t/t_cover_lib_c.cpp
l37
pagesp_user/t_cover_lib_c
P0
htop.a1.pi' 300
-C '
f../../t/t_cover_lib_c.cpp
l37
pagesp_user/t_cover_lib_c
P1
htop.a0.npi' 200
-C '
f../../t/t_cover_lib_c.cpp
l37
pagesp_user/t_cover_lib_c
P1
htop.a1.npi' 300
-C '
f../../t/t_cover_lib_c.cpp
l46
pagesp_user/t_cover_lib_c
okept_one
hmain' 100
-C '
f../../t/t_cover_lib_c.cpp
l47
pagesp_user/t_cover_lib_c
okept_two
hmain' 210
-C '
f../../t/t_cover_lib_c.cpp
l48
pagesp_user/t_cover_lib_c
olost_three
hmain' 220
+C '
f../../t/t_cover_lib_c.cpp
l39
pagesp_user/t_cover_lib_c
P0
htop.a0.pi' 200
+C '
f../../t/t_cover_lib_c.cpp
l39
pagesp_user/t_cover_lib_c
P0
htop.a1.pi' 300
+C '
f../../t/t_cover_lib_c.cpp
l39
pagesp_user/t_cover_lib_c
P1
htop.a0.npi' 200
+C '
f../../t/t_cover_lib_c.cpp
l39
pagesp_user/t_cover_lib_c
P1
htop.a1.npi' 300
+C '
f../../t/t_cover_lib_c.cpp
l48
pagesp_user/t_cover_lib_c
okept_one
hmain' 100
+C '
f../../t/t_cover_lib_c.cpp
l49
pagesp_user/t_cover_lib_c
okept_two
hmain' 210
+C '
f../../t/t_cover_lib_c.cpp
l50
pagesp_user/t_cover_lib_c
olost_three
hmain' 220
diff --git a/test_regress/t/t_cover_lib_2.out b/test_regress/t/t_cover_lib_2.out
index e9fa447e8..fcb461bba 100644
--- a/test_regress/t/t_cover_lib_2.out
+++ b/test_regress/t/t_cover_lib_2.out
@@ -1,3 +1,3 @@
 # SystemC::Coverage-3
-C '
f../../t/t_cover_lib_c.cpp
l46
pagesp_user/t_cover_lib_c
okept_one
hmain' 100
-C '
f../../t/t_cover_lib_c.cpp
l47
pagesp_user/t_cover_lib_c
okept_two
hmain' 210
+C '
f../../t/t_cover_lib_c.cpp
l48
pagesp_user/t_cover_lib_c
okept_one
hmain' 100
+C '
f../../t/t_cover_lib_c.cpp
l49
pagesp_user/t_cover_lib_c
okept_two
hmain' 210
diff --git a/test_regress/t/t_cover_lib_3.out b/test_regress/t/t_cover_lib_3.out
index 7db8b9cb0..5c1bd2c8c 100644
--- a/test_regress/t/t_cover_lib_3.out
+++ b/test_regress/t/t_cover_lib_3.out
@@ -1,3 +1,3 @@
 # SystemC::Coverage-3
-C '
f../../t/t_cover_lib_c.cpp
l46
pagesp_user/t_cover_lib_c
okept_one
hmain' 0
-C '
f../../t/t_cover_lib_c.cpp
l47
pagesp_user/t_cover_lib_c
okept_two
hmain' 0
+C '
f../../t/t_cover_lib_c.cpp
l48
pagesp_user/t_cover_lib_c
okept_one
hmain' 0
+C '
f../../t/t_cover_lib_c.cpp
l49
pagesp_user/t_cover_lib_c
okept_two
hmain' 0
diff --git a/test_regress/t/t_cover_lib_c.cpp b/test_regress/t/t_cover_lib_c.cpp
index ddc94db07..3ba805720 100644
--- a/test_regress/t/t_cover_lib_c.cpp
+++ b/test_regress/t/t_cover_lib_c.cpp
@@ -9,15 +9,17 @@
 //
 //*************************************************************************
 
+#include "verilated_cov.h"
+
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
 #include <iostream>
-#include "svdpi.h"
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
-#include "verilated_cov.h"
-
 #include VM_PREFIX_INCLUDE
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_accessors.cpp b/test_regress/t/t_dpi_accessors.cpp
index f160a888a..3ccae802c 100644
--- a/test_regress/t/t_dpi_accessors.cpp
+++ b/test_regress/t/t_dpi_accessors.cpp
@@ -11,13 +11,12 @@
 //
 //*************************************************************************
 
-#include <iostream>
-#include <iomanip>
-
-#include "svdpi.h"
-
 #include "Vt_dpi_accessors.h"
 #include "Vt_dpi_accessors__Dpi.h"
+#include "svdpi.h"
+
+#include <iomanip>
+#include <iostream>
 
 using std::cout;
 using std::dec;
diff --git a/test_regress/t/t_dpi_arg_inout_unpack.cpp b/test_regress/t/t_dpi_arg_inout_unpack.cpp
index fffe3fcb1..4c3ffdc7f 100644
--- a/test_regress/t/t_dpi_arg_inout_unpack.cpp
+++ b/test_regress/t/t_dpi_arg_inout_unpack.cpp
@@ -89,7 +89,8 @@ void set_uint(svBitVecVal* v0, sv_longint_unsigned_t val, int bitwidth) {
     }
 }
 
-template <typename T> bool compare(const T& act, const T& exp) {
+template <typename T>
+bool compare(const T& act, const T& exp) {
     if (exp == act) {
         if (VERBOSE_MESSAGE) std::cout << "OK Exp:" << exp << " actual:" << act << std::endl;
         return true;
@@ -140,13 +141,15 @@ bool compare(const svBitVecVal* v0, sv_longint_unsigned_t val, int bitwidth) {
     return true;
 }
 
-template <typename T> bool update_0d(T* v) {
+template <typename T>
+bool update_0d(T* v) {
     if (!compare<T>(*v, 42)) return false;
     ++(*v);
     return true;
 }
 
-template <typename T> bool update_1d(T* v) {
+template <typename T>
+bool update_1d(T* v) {
     if (!compare<T>(v[0], 43)) return false;
     if (!compare<T>(v[1], 44)) return false;
     ++v[0];
@@ -154,7 +157,8 @@ template <typename T> bool update_1d(T* v) {
     return true;
 }
 
-template <typename T> bool update_2d(T* v) {
+template <typename T>
+bool update_2d(T* v) {
     if (!compare<T>(v[0 * 2 + 1], 45)) return false;
     if (!compare<T>(v[1 * 2 + 1], 46)) return false;
     if (!compare<T>(v[2 * 2 + 1], 47)) return false;
@@ -164,7 +168,8 @@ template <typename T> bool update_2d(T* v) {
     return true;
 }
 
-template <typename T> bool update_3d(T* v) {
+template <typename T>
+bool update_3d(T* v) {
     if (!compare<T>(v[(0 * 3 + 0) * 2 + 0], 48)) return false;
     if (!compare<T>(v[(1 * 3 + 0) * 2 + 0], 49)) return false;
     if (!compare<T>(v[(2 * 3 + 0) * 2 + 0], 50)) return false;
@@ -209,12 +214,14 @@ bool update_3d_scalar(svScalar* v) {
     return true;
 }
 
-template <typename T> bool update_0d(T* v, int bitwidth) {
+template <typename T>
+bool update_0d(T* v, int bitwidth) {
     if (!compare(v, 42, bitwidth)) return false;
     set_uint(v, 43, bitwidth);
     return true;
 }
-template <typename T> bool update_1d(T* v, int bitwidth) {
+template <typename T>
+bool update_1d(T* v, int bitwidth) {
     const int unit = (bitwidth + 31) / 32;
     if (!compare(v + unit * 0, 43, bitwidth)) return false;
     if (!compare(v + unit * 1, 44, bitwidth)) return false;
@@ -222,7 +229,8 @@ template <typename T> bool update_1d(T* v, int bitwidth) {
     set_uint(v + unit * 1, 45, bitwidth);
     return true;
 }
-template <typename T> bool update_2d(T* v, int bitwidth) {
+template <typename T>
+bool update_2d(T* v, int bitwidth) {
     const int unit = (bitwidth + 31) / 32;
     if (!compare(v + unit * (0 * 2 + 1), 45, bitwidth)) return false;
     if (!compare(v + unit * (1 * 2 + 1), 46, bitwidth)) return false;
@@ -232,7 +240,8 @@ template <typename T> bool update_2d(T* v, int bitwidth) {
     set_uint(v + unit * (2 * 2 + 1), 48, bitwidth);
     return true;
 }
-template <typename T> bool update_3d(T* v, int bitwidth) {
+template <typename T>
+bool update_3d(T* v, int bitwidth) {
     const int unit = (bitwidth + 31) / 32;
     if (!compare(v + unit * ((0 * 3 + 0) * 2 + 0), 48, bitwidth)) return false;
     if (!compare(v + unit * ((1 * 3 + 0) * 2 + 0), 49, bitwidth)) return false;
@@ -245,7 +254,8 @@ template <typename T> bool update_3d(T* v, int bitwidth) {
     return true;
 }
 
-template <typename T> void set_values(T (&v)[4][3][2]) {
+template <typename T>
+void set_values(T (&v)[4][3][2]) {
     for (int i = 0; i < 4; ++i)
         for (int j = 0; j < 3; ++j)
             for (int k = 0; k < 2; ++k) v[i][j][k] = 0;
@@ -261,7 +271,8 @@ template <typename T> void set_values(T (&v)[4][3][2]) {
     v[3][0][0] = 51;
 }
 
-template <typename T, size_t N> void set_values(T (&v)[4][3][2][N], int bitwidth) {
+template <typename T, size_t N>
+void set_values(T (&v)[4][3][2][N], int bitwidth) {
     for (int i = 0; i < 4; ++i)
         for (int j = 0; j < 3; ++j)
             for (int k = 0; k < 2; ++k) set_uint(v[i][j][k], 0, bitwidth);
@@ -277,29 +288,39 @@ template <typename T, size_t N> void set_values(T (&v)[4][3][2][N], int bitwidth
     set_uint(v[3][0][0], 51, bitwidth);
 }
 
-template <typename T> bool check_0d(T v) { return compare<T>(v, 43); }
-template <typename T> bool check_1d(const T (&v)[2]) {
+template <typename T>
+bool check_0d(T v) {
+    return compare<T>(v, 43);
+}
+template <typename T>
+bool check_1d(const T (&v)[2]) {
     return compare<T>(v[0], 44) && compare<T>(v[1], 45);
 }
-template <typename T> bool check_2d(const T (&v)[3][2]) {
+template <typename T>
+bool check_2d(const T (&v)[3][2]) {
     return compare<T>(v[0][1], 46) && compare<T>(v[1][1], 47) && compare<T>(v[2][1], 48);
 }
-template <typename T> bool check_3d(const T (&v)[4][3][2]) {
+template <typename T>
+bool check_3d(const T (&v)[4][3][2]) {
     return compare<T>(v[0][0][0], 49) && compare<T>(v[1][0][0], 50) && compare<T>(v[2][0][0], 51)
            && compare<T>(v[3][0][0], 52);
 }
 
-template <typename T, size_t N> bool check_0d(const T (&v)[N], unsigned int bitwidth) {
+template <typename T, size_t N>
+bool check_0d(const T (&v)[N], unsigned int bitwidth) {
     return compare(v, 43, bitwidth);
 }
-template <typename T, size_t N> bool check_1d(const T (&v)[2][N], unsigned int bitwidth) {
+template <typename T, size_t N>
+bool check_1d(const T (&v)[2][N], unsigned int bitwidth) {
     return compare(v[0], 44, bitwidth) && compare(v[1], 45, bitwidth);
 }
-template <typename T, size_t N> bool check_2d(const T (&v)[3][2][N], unsigned int bitwidth) {
+template <typename T, size_t N>
+bool check_2d(const T (&v)[3][2][N], unsigned int bitwidth) {
     return compare(v[0][1], 46, bitwidth) && compare(v[1][1], 47, bitwidth)
            && compare(v[2][1], 48, bitwidth);
 }
-template <typename T, size_t N> bool check_3d(const T (&v)[4][3][2][N], unsigned int bitwidth) {
+template <typename T, size_t N>
+bool check_3d(const T (&v)[4][3][2][N], unsigned int bitwidth) {
     return compare(v[0][0][0], 49, bitwidth) && compare(v[1][0][0], 50, bitwidth)
            && compare(v[2][0][0], 51, bitwidth) && compare(v[3][0][0], 52, bitwidth);
 }
diff --git a/test_regress/t/t_dpi_arg_input_unpack.cpp b/test_regress/t/t_dpi_arg_input_unpack.cpp
index 2442f9578..3fe37bf1b 100644
--- a/test_regress/t/t_dpi_arg_input_unpack.cpp
+++ b/test_regress/t/t_dpi_arg_input_unpack.cpp
@@ -75,7 +75,8 @@ const bool VERBOSE_MESSAGE = false;
         abort(); \
     } while (0)
 
-template <typename T> bool compare(const T& act, const T& exp) {
+template <typename T>
+bool compare(const T& act, const T& exp) {
     if (exp == act) {
         if (VERBOSE_MESSAGE) std::cout << "OK Exp:" << exp << " actual:" << act << std::endl;
         return true;
@@ -115,15 +116,21 @@ bool compare(const svBitVecVal* v0, sv_longint_unsigned_t val, int bitwidth) {
     return true;
 }
 
-template <typename T> bool check_0d(T v) { return compare<T>(v, 42); }
-template <typename T> bool check_1d(const T* v) {
+template <typename T>
+bool check_0d(T v) {
+    return compare<T>(v, 42);
+}
+template <typename T>
+bool check_1d(const T* v) {
     return compare<T>(v[0], 43) && compare<T>(v[1], 44);
 }
-template <typename T> bool check_2d(const T* v) {
+template <typename T>
+bool check_2d(const T* v) {
     return compare<T>(v[0 * 2 + 1], 45) && compare<T>(v[1 * 2 + 1], 46)
            && compare<T>(v[2 * 2 + 1], 47);
 }
-template <typename T> bool check_3d(const T* v) {
+template <typename T>
+bool check_3d(const T* v) {
     return compare<T>(v[(0 * 3 + 0) * 2 + 0], 48) && compare<T>(v[(1 * 3 + 0) * 2 + 0], 49)
            && compare<T>(v[(2 * 3 + 0) * 2 + 0], 50) && compare<T>(v[(3 * 3 + 0) * 2 + 0], 51);
 }
@@ -181,7 +188,8 @@ bool check_3d(const char** v) {
            && compare<std::string>(v[(3 * 3 + 0) * 2 + 0], "51");
 }
 
-template <typename T> void set_values(T (&v)[4][3][2]) {
+template <typename T>
+void set_values(T (&v)[4][3][2]) {
     for (int i = 0; i < 4; ++i)
         for (int j = 0; j < 3; ++j)
             for (int k = 0; k < 2; ++k) v[i][j][k] = 0;
@@ -215,7 +223,8 @@ void set_uint(svBitVecVal* v0, sv_longint_unsigned_t val, int bitwidth) {
     }
 }
 
-template <size_t N> void set_values(svLogicVecVal (&v)[4][3][2][N], int bitwidth) {
+template <size_t N>
+void set_values(svLogicVecVal (&v)[4][3][2][N], int bitwidth) {
     for (int i = 0; i < 4; ++i)
         for (int j = 0; j < 3; ++j)
             for (int k = 0; k < 2; ++k) set_uint(v[i][j][k], 0, bitwidth);
@@ -234,7 +243,8 @@ template <size_t N> void set_values(svLogicVecVal (&v)[4][3][2][N], int bitwidth
     set_uint(v[3][0][0], 51, bitwidth);
 }
 
-template <size_t N> void set_values(svBitVecVal (&v)[4][3][2][N], int bitwidth) {
+template <size_t N>
+void set_values(svBitVecVal (&v)[4][3][2][N], int bitwidth) {
     for (int i = 0; i < 4; ++i)
         for (int j = 0; j < 3; ++j)
             for (int k = 0; k < 2; ++k) set_uint(v[i][j][k], 0, bitwidth);
diff --git a/test_regress/t/t_dpi_arg_output_unpack.cpp b/test_regress/t/t_dpi_arg_output_unpack.cpp
index 918081f8e..4b288f565 100644
--- a/test_regress/t/t_dpi_arg_output_unpack.cpp
+++ b/test_regress/t/t_dpi_arg_output_unpack.cpp
@@ -89,18 +89,24 @@ void set_uint(svBitVecVal* v0, sv_longint_unsigned_t val, int bitwidth) {
     }
 }
 
-template <typename T> void set_0d(T* v) { *v = 42; }
-template <typename T> void set_1d(T* v) {
+template <typename T>
+void set_0d(T* v) {
+    *v = 42;
+}
+template <typename T>
+void set_1d(T* v) {
     v[0] = 43;
     v[1] = 44;
 }
 
-template <typename T> void set_2d(T* v) {
+template <typename T>
+void set_2d(T* v) {
     v[0 * 2 + 1] = 45;
     v[1 * 2 + 1] = 46;
     v[2 * 2 + 1] = 47;
 }
-template <typename T> void set_3d(T* v) {
+template <typename T>
+void set_3d(T* v) {
     v[(0 * 3 + 0) * 2 + 0] = 48;
     v[(1 * 3 + 0) * 2 + 0] = 49;
     v[(2 * 3 + 0) * 2 + 0] = 50;
@@ -173,7 +179,8 @@ void set_3d(svBitVecVal* v, int bitwidth) {
     set_uint(v + ((3 * 3 + 0) * 2 + 0) * unit, 51, bitwidth);
 }
 
-template <typename T> bool compare(const T& act, const T& exp) {
+template <typename T>
+bool compare(const T& act, const T& exp) {
     if (exp == act) {
         if (VERBOSE_MESSAGE) std::cout << "OK Exp:" << exp << " actual:" << act << std::endl;
         return true;
@@ -183,14 +190,20 @@ template <typename T> bool compare(const T& act, const T& exp) {
     }
 }
 
-template <typename T> bool check_0d(T v) { return compare<T>(v, 42); }
-template <typename T> bool check_1d(const T (&v)[2]) {
+template <typename T>
+bool check_0d(T v) {
+    return compare<T>(v, 42);
+}
+template <typename T>
+bool check_1d(const T (&v)[2]) {
     return compare<T>(v[0], 43) && compare<T>(v[1], 44);
 }
-template <typename T> bool check_2d(const T (&v)[3][2]) {
+template <typename T>
+bool check_2d(const T (&v)[3][2]) {
     return compare<T>(v[0][1], 45) && compare<T>(v[1][1], 46) && compare<T>(v[2][1], 47);
 }
-template <typename T> bool check_3d(const T (&v)[4][3][2]) {
+template <typename T>
+bool check_3d(const T (&v)[4][3][2]) {
     return compare<T>(v[0][0][0], 48) && compare<T>(v[1][0][0], 49) && compare<T>(v[2][0][0], 50)
            && compare<T>(v[3][0][0], 51);
 }
@@ -225,17 +238,21 @@ bool compare(const svBitVecVal* v0, sv_longint_unsigned_t val, int bitwidth) {
     return true;
 }
 
-template <typename T, size_t N> bool check_0d(const T (&v)[N], int bitwidth) {
+template <typename T, size_t N>
+bool check_0d(const T (&v)[N], int bitwidth) {
     return compare(v, 42, bitwidth);
 }
-template <typename T, size_t N> bool check_1d(const T (&v)[2][N], int bitwidth) {
+template <typename T, size_t N>
+bool check_1d(const T (&v)[2][N], int bitwidth) {
     return compare(v[0], 43, bitwidth) && compare(v[1], 44, bitwidth);
 }
-template <typename T, size_t N> bool check_2d(const T (&v)[3][2][N], int bitwidth) {
+template <typename T, size_t N>
+bool check_2d(const T (&v)[3][2][N], int bitwidth) {
     return compare(v[0][1], 45, bitwidth) && compare(v[1][1], 46, bitwidth)
            && compare(v[2][1], 47, bitwidth);
 }
-template <typename T, size_t N> bool check_3d(const T (&v)[4][3][2][N], int bitwidth) {
+template <typename T, size_t N>
+bool check_3d(const T (&v)[4][3][2][N], int bitwidth) {
     return compare(v[0][0][0], 48, bitwidth) && compare(v[1][0][0], 49, bitwidth)
            && compare(v[2][0][0], 50, bitwidth) && compare(v[3][0][0], 51, bitwidth);
 }
diff --git a/test_regress/t/t_dpi_context_c.cpp b/test_regress/t/t_dpi_context_c.cpp
index 5c1060ed4..e21d79363 100644
--- a/test_regress/t/t_dpi_context_c.cpp
+++ b/test_regress/t/t_dpi_context_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
-#include <cstdio>
 #include "svdpi.h"
 
+#include <cstdio>
+
 //======================================================================
 
 // clang-format off
diff --git a/test_regress/t/t_dpi_display_c.cpp b/test_regress/t/t_dpi_display_c.cpp
index 41d292027..3a8f93c92 100644
--- a/test_regress/t/t_dpi_display_c.cpp
+++ b/test_regress/t/t_dpi_display_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
-#include <cstdio>
 #include "svdpi.h"
 
+#include <cstdio>
+
 //======================================================================
 
 // clang-format off
diff --git a/test_regress/t/t_dpi_export_c.cpp b/test_regress/t/t_dpi_export_c.cpp
index 9493e4af6..da9fee221 100644
--- a/test_regress/t/t_dpi_export_c.cpp
+++ b/test_regress/t/t_dpi_export_c.cpp
@@ -9,11 +9,12 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cinttypes>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_dpi_imp_gen_c.cpp b/test_regress/t/t_dpi_imp_gen_c.cpp
index 15a03eea5..b55252b19 100644
--- a/test_regress/t/t_dpi_imp_gen_c.cpp
+++ b/test_regress/t/t_dpi_imp_gen_c.cpp
@@ -9,9 +9,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_dpi_import_c.cpp b/test_regress/t/t_dpi_import_c.cpp
index c28c58d0e..71554035e 100644
--- a/test_regress/t/t_dpi_import_c.cpp
+++ b/test_regress/t/t_dpi_import_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_dpi_lib_c.cpp b/test_regress/t/t_dpi_lib_c.cpp
index 29a4d36b4..2667681bf 100644
--- a/test_regress/t/t_dpi_lib_c.cpp
+++ b/test_regress/t/t_dpi_lib_c.cpp
@@ -9,11 +9,13 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
 #include <iostream>
-#include "svdpi.h"
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_open_c.cpp b/test_regress/t/t_dpi_open_c.cpp
index 60b6b1d33..a09efcbab 100644
--- a/test_regress/t/t_dpi_open_c.cpp
+++ b/test_regress/t/t_dpi_open_c.cpp
@@ -9,11 +9,13 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
 #include <iostream>
-#include "svdpi.h"
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_open_elem_c.cpp b/test_regress/t/t_dpi_open_elem_c.cpp
index 6897375e6..0af199d79 100644
--- a/test_regress/t/t_dpi_open_elem_c.cpp
+++ b/test_regress/t/t_dpi_open_elem_c.cpp
@@ -9,11 +9,13 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
 #include <iostream>
-#include "svdpi.h"
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_open_oob_bad_c.cpp b/test_regress/t/t_dpi_open_oob_bad_c.cpp
index 2dd22cb86..f3b44189c 100644
--- a/test_regress/t/t_dpi_open_oob_bad_c.cpp
+++ b/test_regress/t/t_dpi_open_oob_bad_c.cpp
@@ -9,11 +9,13 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
 #include <iostream>
-#include "svdpi.h"
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_open_vecval_c.cpp b/test_regress/t/t_dpi_open_vecval_c.cpp
index b95fb6615..014db3f38 100644
--- a/test_regress/t/t_dpi_open_vecval_c.cpp
+++ b/test_regress/t/t_dpi_open_vecval_c.cpp
@@ -9,11 +9,13 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
 #include <iostream>
-#include "svdpi.h"
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_openfirst_c.cpp b/test_regress/t/t_dpi_openfirst_c.cpp
index 2d07a60c5..d33630fe2 100644
--- a/test_regress/t/t_dpi_openfirst_c.cpp
+++ b/test_regress/t/t_dpi_openfirst_c.cpp
@@ -9,11 +9,13 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
 #include <iostream>
-#include "svdpi.h"
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_qw_c.cpp b/test_regress/t/t_dpi_qw_c.cpp
index 49e15cf0f..7a18e6b83 100644
--- a/test_regress/t/t_dpi_qw_c.cpp
+++ b/test_regress/t/t_dpi_qw_c.cpp
@@ -9,9 +9,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_dpi_result_type.cpp b/test_regress/t/t_dpi_result_type.cpp
index 21ea9e772..a0d7b3cb5 100644
--- a/test_regress/t/t_dpi_result_type.cpp
+++ b/test_regress/t/t_dpi_result_type.cpp
@@ -9,12 +9,12 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 
-#include "svdpi.h"
-
 // clang-format off
 #if defined(VERILATOR)  // Verilator
 # include "Vt_dpi_result_type__Dpi.h"
diff --git a/test_regress/t/t_dpi_shortcircuit_c.cpp b/test_regress/t/t_dpi_shortcircuit_c.cpp
index dad4af8aa..9abe7e53d 100644
--- a/test_regress/t/t_dpi_shortcircuit_c.cpp
+++ b/test_regress/t/t_dpi_shortcircuit_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_dpi_string_c.cpp b/test_regress/t/t_dpi_string_c.cpp
index ba6583d79..05b001886 100644
--- a/test_regress/t/t_dpi_string_c.cpp
+++ b/test_regress/t/t_dpi_string_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_dpi_sys_c.cpp b/test_regress/t/t_dpi_sys_c.cpp
index 156609f16..d1e6baf8f 100644
--- a/test_regress/t/t_dpi_sys_c.cpp
+++ b/test_regress/t/t_dpi_sys_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
-#include <cstdio>
 #include "svdpi.h"
 
+#include <cstdio>
+
 //======================================================================
 
 // clang-format off
diff --git a/test_regress/t/t_dpi_threads_c.cpp b/test_regress/t/t_dpi_threads_c.cpp
index 0b2900352..9e02f5416 100644
--- a/test_regress/t/t_dpi_threads_c.cpp
+++ b/test_regress/t/t_dpi_threads_c.cpp
@@ -9,11 +9,12 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <atomic>
 #include <cstdio>
 #include <iostream>
 #include <unistd.h>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_dpi_vams.cpp b/test_regress/t/t_dpi_vams.cpp
index 264eb18cd..13ee8b82b 100644
--- a/test_regress/t/t_dpi_vams.cpp
+++ b/test_regress/t/t_dpi_vams.cpp
@@ -7,6 +7,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #include <verilated.h>
+
 #include "Vt_dpi_vams.h"
 
 //======================================================================
diff --git a/test_regress/t/t_dpi_var.cpp b/test_regress/t/t_dpi_var.cpp
index 190044f69..855e022b7 100644
--- a/test_regress/t/t_dpi_var.cpp
+++ b/test_regress/t/t_dpi_var.cpp
@@ -11,10 +11,10 @@
 
 #include VM_PREFIX_INCLUDE
 #include "verilated.h"
-#include "svdpi.h"
-
 #include "verilated_syms.h"
 
+#include "svdpi.h"
+
 //======================================================================
 
 struct MyMon {
diff --git a/test_regress/t/t_embed1_c.cpp b/test_regress/t/t_embed1_c.cpp
index e9deda818..0e6e075cb 100644
--- a/test_regress/t/t_embed1_c.cpp
+++ b/test_regress/t/t_embed1_c.cpp
@@ -9,10 +9,10 @@
 //
 //*************************************************************************
 
-#include <cstdio>
+#include "../t_embed1_child/Vt_embed1_child.h"
 #include "svdpi.h"
 
-#include "../t_embed1_child/Vt_embed1_child.h"
+#include <cstdio>
 
 //======================================================================
 
diff --git a/test_regress/t/t_enum_public.cpp b/test_regress/t/t_enum_public.cpp
index e46b8d57d..2ff06eea5 100644
--- a/test_regress/t/t_enum_public.cpp
+++ b/test_regress/t/t_enum_public.cpp
@@ -7,8 +7,8 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #include <verilated.h>
-#include "Vt_enum_public.h"
 
+#include "Vt_enum_public.h"
 #include "Vt_enum_public_p3.h"
 #include "Vt_enum_public_p62.h"
 
diff --git a/test_regress/t/t_flag_fi.cpp b/test_regress/t/t_flag_fi.cpp
index f91a5f303..176c434b7 100644
--- a/test_regress/t/t_flag_fi.cpp
+++ b/test_regress/t/t_flag_fi.cpp
@@ -7,6 +7,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #include <verilated.h>
+
 #include "Vt_flag_fi.h"
 
 //======================================================================
diff --git a/test_regress/t/t_flag_ldflags_c.cpp b/test_regress/t/t_flag_ldflags_c.cpp
index 6b32be9b9..113017b52 100644
--- a/test_regress/t/t_flag_ldflags_c.cpp
+++ b/test_regress/t/t_flag_ldflags_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
-#include <cstdio>
 #include "svdpi.h"
 
+#include <cstdio>
+
 //======================================================================
 
 // clang-format off
diff --git a/test_regress/t/t_forceable_net.cpp b/test_regress/t/t_forceable_net.cpp
index da9388a75..278020f0b 100644
--- a/test_regress/t/t_forceable_net.cpp
+++ b/test_regress/t/t_forceable_net.cpp
@@ -4,10 +4,11 @@
 // any use, without warranty, 2021 by Geza Lore.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <memory>
-
 #include "verilatedos.h"
+
 #include "verilated.h"
+
+#include <memory>
 #if VM_TRACE
 #include "verilated_vcd_c.h"
 #endif
diff --git a/test_regress/t/t_forceable_var.cpp b/test_regress/t/t_forceable_var.cpp
index 931903300..9286d3606 100644
--- a/test_regress/t/t_forceable_var.cpp
+++ b/test_regress/t/t_forceable_var.cpp
@@ -4,10 +4,11 @@
 // any use, without warranty, 2021 by Geza Lore.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <memory>
-
 #include "verilatedos.h"
+
 #include "verilated.h"
+
+#include <memory>
 #if VM_TRACE
 #include "verilated_vcd_c.h"
 #endif
diff --git a/test_regress/t/t_func_rand.cpp b/test_regress/t/t_func_rand.cpp
index c3b43a385..d2be39ab9 100644
--- a/test_regress/t/t_func_rand.cpp
+++ b/test_regress/t/t_func_rand.cpp
@@ -7,6 +7,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #include <verilated.h>
+
 #include "Vt_func_rand.h"
 
 double sc_time_stamp() { return 0; }
diff --git a/test_regress/t/t_gantt_two.cpp b/test_regress/t/t_gantt_two.cpp
index da253fab7..ecd0be219 100644
--- a/test_regress/t/t_gantt_two.cpp
+++ b/test_regress/t/t_gantt_two.cpp
@@ -6,10 +6,12 @@
 // SPDX-License-Identifier: CC0-1.0
 //
 
-#include <memory>
 #include "verilated.h"
+
 #include "Vt_gantt_two.h"
 
+#include <memory>
+
 int main(int argc, char** argv, char** env) {
     srand48(5);
 
diff --git a/test_regress/t/t_leak.cpp b/test_regress/t/t_leak.cpp
index 247dce41a..decf48891 100644
--- a/test_regress/t/t_leak.cpp
+++ b/test_regress/t/t_leak.cpp
@@ -8,9 +8,10 @@
 // Version 2.0.
 // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
 
-#include <cstdlib>
-#include <cstdio>
 #include <verilated.h>
+
+#include <cstdio>
+#include <cstdlib>
 #include VM_PREFIX_INCLUDE
 
 unsigned int main_time = 0;
diff --git a/test_regress/t/t_math_imm2.cpp b/test_regress/t/t_math_imm2.cpp
index 2736601e0..54c1657e5 100644
--- a/test_regress/t/t_math_imm2.cpp
+++ b/test_regress/t/t_math_imm2.cpp
@@ -4,6 +4,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #include <verilated.h>
+
 #include "Vt_math_imm2.h"
 
 double sc_time_stamp() { return 0; }
diff --git a/test_regress/t/t_mem_slot.cpp b/test_regress/t/t_mem_slot.cpp
index 02f228c9b..5c32d9ec8 100644
--- a/test_regress/t/t_mem_slot.cpp
+++ b/test_regress/t/t_mem_slot.cpp
@@ -3,10 +3,12 @@
 // any use, without warranty, 2020 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <cstdlib>
 #include <verilated.h>
+
 #include "Vt_mem_slot.h"
 
+#include <cstdlib>
+
 double sc_time_stamp() { return 0; }
 
 unsigned int Array[3];
diff --git a/test_regress/t/t_multitop_sig.cpp b/test_regress/t/t_multitop_sig.cpp
index aa3f7459f..91115cc41 100644
--- a/test_regress/t/t_multitop_sig.cpp
+++ b/test_regress/t/t_multitop_sig.cpp
@@ -6,10 +6,13 @@
 // any use, without warranty, 2006 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <iostream>
 #include <verilated.h>
+
 #include "Vt_multitop_sig.h"
 
+#include <iostream>
+
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 double sc_time_stamp() { return 0; }
diff --git a/test_regress/t/t_order_dpi_export_1.cpp b/test_regress/t/t_order_dpi_export_1.cpp
index 1dcec5c1e..7a261f661 100644
--- a/test_regress/t/t_order_dpi_export_1.cpp
+++ b/test_regress/t/t_order_dpi_export_1.cpp
@@ -9,10 +9,9 @@
 //
 //*************************************************************************
 
-#include <svdpi.h>
-
 #include <Vt_order_dpi_export_1.h>
 #include <Vt_order_dpi_export_1__Dpi.h>
+#include <svdpi.h>
 
 int main(int argc, char* argv[]) {
     Vt_order_dpi_export_1* const tb = new Vt_order_dpi_export_1;
diff --git a/test_regress/t/t_order_dpi_export_2.cpp b/test_regress/t/t_order_dpi_export_2.cpp
index 3ba47b0d3..fb134ddeb 100644
--- a/test_regress/t/t_order_dpi_export_2.cpp
+++ b/test_regress/t/t_order_dpi_export_2.cpp
@@ -9,10 +9,9 @@
 //
 //*************************************************************************
 
-#include <svdpi.h>
-
 #include <Vt_order_dpi_export_2.h>
 #include <Vt_order_dpi_export_2__Dpi.h>
+#include <svdpi.h>
 
 void toggle_other_clk(svBit val) { set_other_clk(val); }
 
diff --git a/test_regress/t/t_order_dpi_export_3.cpp b/test_regress/t/t_order_dpi_export_3.cpp
index 2855845c1..c8a5fcb25 100644
--- a/test_regress/t/t_order_dpi_export_3.cpp
+++ b/test_regress/t/t_order_dpi_export_3.cpp
@@ -9,10 +9,9 @@
 //
 //*************************************************************************
 
-#include <svdpi.h>
-
 #include <Vt_order_dpi_export_3.h>
 #include <Vt_order_dpi_export_3__Dpi.h>
+#include <svdpi.h>
 
 void toggle_other_clk(svBit val) { set_other_clk(val); }
 
diff --git a/test_regress/t/t_order_dpi_export_4.cpp b/test_regress/t/t_order_dpi_export_4.cpp
index e4ecd5c89..95c169f47 100644
--- a/test_regress/t/t_order_dpi_export_4.cpp
+++ b/test_regress/t/t_order_dpi_export_4.cpp
@@ -9,10 +9,9 @@
 //
 //*************************************************************************
 
-#include <svdpi.h>
-
 #include <Vt_order_dpi_export_4.h>
 #include <Vt_order_dpi_export_4__Dpi.h>
+#include <svdpi.h>
 
 void toggle_other_clk(svBit val) { set_other_clk(val); }
 
diff --git a/test_regress/t/t_order_dpi_export_5.cpp b/test_regress/t/t_order_dpi_export_5.cpp
index c14bf9ef3..494b161a8 100644
--- a/test_regress/t/t_order_dpi_export_5.cpp
+++ b/test_regress/t/t_order_dpi_export_5.cpp
@@ -9,10 +9,9 @@
 //
 //*************************************************************************
 
-#include <svdpi.h>
-
 #include <Vt_order_dpi_export_5.h>
 #include <Vt_order_dpi_export_5__Dpi.h>
+#include <svdpi.h>
 
 int main(int argc, char* argv[]) {
     Vt_order_dpi_export_5* const tb = new Vt_order_dpi_export_5;
diff --git a/test_regress/t/t_order_multidriven.cpp b/test_regress/t/t_order_multidriven.cpp
index 628fbbc74..d8cd782a6 100644
--- a/test_regress/t/t_order_multidriven.cpp
+++ b/test_regress/t/t_order_multidriven.cpp
@@ -4,10 +4,11 @@
 // without warranty, 2013 by Ted Campbell.
 // SPDX-License-Identifier: CC0-1.0
 
-#include "Vt_order_multidriven.h"
 #include "verilated.h"
 #include "verilated_vcd_c.h"
 
+#include "Vt_order_multidriven.h"
+
 double sc_time_stamp() { return 0; }
 
 Vt_order_multidriven* vcore;
diff --git a/test_regress/t/t_order_quad.cpp b/test_regress/t/t_order_quad.cpp
index dab33bd3d..95eddc4fa 100644
--- a/test_regress/t/t_order_quad.cpp
+++ b/test_regress/t/t_order_quad.cpp
@@ -7,6 +7,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #include <verilated.h>
+
 #include "Vt_order_quad.h"
 
 //======================================================================
diff --git a/test_regress/t/t_param_public.cpp b/test_regress/t/t_param_public.cpp
index c206441e3..66bfd20cf 100644
--- a/test_regress/t/t_param_public.cpp
+++ b/test_regress/t/t_param_public.cpp
@@ -7,8 +7,8 @@
 // SPDX-License-Identifier: CC0-1.0
 
 #include <verilated.h>
-#include "Vt_param_public.h"
 
+#include "Vt_param_public.h"
 #include "Vt_param_public_p.h"
 #include "Vt_param_public_t.h"
 
diff --git a/test_regress/t/t_protect_ids_c.cpp b/test_regress/t/t_protect_ids_c.cpp
index 484ba07b8..8c14a7cc8 100644
--- a/test_regress/t/t_protect_ids_c.cpp
+++ b/test_regress/t/t_protect_ids_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
+#include "svdpi.h"
+
 #include <cstdio>
 #include <cstring>
-#include "svdpi.h"
 
 //======================================================================
 
diff --git a/test_regress/t/t_runflag_uninit_bad.cpp b/test_regress/t/t_runflag_uninit_bad.cpp
index e1484272f..93b8eaf62 100644
--- a/test_regress/t/t_runflag_uninit_bad.cpp
+++ b/test_regress/t/t_runflag_uninit_bad.cpp
@@ -6,10 +6,10 @@
 // any use, without warranty, 2010 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <iostream>
-
 #include <verilated.h>
 #include <verilated_save.h>
+
+#include <iostream>
 #include VM_PREFIX_INCLUDE
 
 //======================================================================
diff --git a/test_regress/t/t_savable_open_bad2.cpp b/test_regress/t/t_savable_open_bad2.cpp
index f9faddd91..c3a278118 100644
--- a/test_regress/t/t_savable_open_bad2.cpp
+++ b/test_regress/t/t_savable_open_bad2.cpp
@@ -6,12 +6,13 @@
 // any use, without warranty, 2010 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <iostream>
-
 #include <verilated.h>
 #include <verilated_save.h>
+
+#include <iostream>
 #include VM_PREFIX_INCLUDE
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 //======================================================================
diff --git a/test_regress/t/t_scope_map.cpp b/test_regress/t/t_scope_map.cpp
index 14e7d5812..9136c8ee3 100644
--- a/test_regress/t/t_scope_map.cpp
+++ b/test_regress/t/t_scope_map.cpp
@@ -9,11 +9,12 @@
 #include <verilated.h>
 #include <verilated_syms.h>
 #include <verilated_vcd_c.h>
-#include <map>
-#include <string>
 
 #include "Vt_scope_map.h"
 
+#include <map>
+#include <string>
+
 const unsigned long long dt_2 = 3;
 
 int main(int argc, char** argv, char** env) {
diff --git a/test_regress/t/t_time_vpi_c.cpp b/test_regress/t/t_time_vpi_c.cpp
index 901de71cd..9b520afe4 100644
--- a/test_regress/t/t_time_vpi_c.cpp
+++ b/test_regress/t/t_time_vpi_c.cpp
@@ -9,9 +9,12 @@
 //
 //*************************************************************************
 
-#include <cstdio>
 #include "svdpi.h"
 #include "vpi_user.h"
+
+#include <cstdio>
+
+// These require the above. Comment prevents clang-format moving them
 #include "TestVpi.h"
 
 //======================================================================
diff --git a/test_regress/t/t_trace_cat.cpp b/test_regress/t/t_trace_cat.cpp
index 8f851daf7..914f87a84 100644
--- a/test_regress/t/t_trace_cat.cpp
+++ b/test_regress/t/t_trace_cat.cpp
@@ -6,10 +6,11 @@
 // any use, without warranty, 2008 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <memory>
 #include <verilated.h>
 #include <verilated_vcd_c.h>
 
+#include <memory>
+
 #include VM_PREFIX_INCLUDE
 
 unsigned long long main_time = 0;
diff --git a/test_regress/t/t_trace_cat_fst.cpp b/test_regress/t/t_trace_cat_fst.cpp
index 8432da0e3..bb35df44b 100644
--- a/test_regress/t/t_trace_cat_fst.cpp
+++ b/test_regress/t/t_trace_cat_fst.cpp
@@ -6,10 +6,11 @@
 // any use, without warranty, 2008 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <memory>
 #include <verilated.h>
 #include <verilated_fst_c.h>
 
+#include <memory>
+
 #include VM_PREFIX_INCLUDE
 
 unsigned long long main_time = 0;
diff --git a/test_regress/t/t_trace_dumpvars_dyn.cpp b/test_regress/t/t_trace_dumpvars_dyn.cpp
index f5d5f986e..02634e50a 100644
--- a/test_regress/t/t_trace_dumpvars_dyn.cpp
+++ b/test_regress/t/t_trace_dumpvars_dyn.cpp
@@ -6,11 +6,12 @@
 // any use, without warranty, 2022 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <memory>
 #include <verilated.h>
 #include <verilated_fst_c.h>
 #include <verilated_vcd_c.h>
 
+#include <memory>
+
 #include VM_PREFIX_INCLUDE
 
 unsigned long long main_time = 0;
diff --git a/test_regress/t/t_trace_public_func.cpp b/test_regress/t/t_trace_public_func.cpp
index b17540c2d..bd31c9a6f 100644
--- a/test_regress/t/t_trace_public_func.cpp
+++ b/test_regress/t/t_trace_public_func.cpp
@@ -6,10 +6,11 @@
 // any use, without warranty, 2008 by Wilson Snyder.
 // SPDX-License-Identifier: CC0-1.0
 
-#include <memory>
 #include <verilated.h>
 #include <verilated_vcd_c.h>
 
+#include <memory>
+
 // clang-format off
 #include VM_PREFIX_INCLUDE
 #ifdef T_TRACE_PUBLIC_FUNC_VLT
diff --git a/test_regress/t/t_var_overwidth_bad.cpp b/test_regress/t/t_var_overwidth_bad.cpp
index 2aa7d801a..d82237617 100644
--- a/test_regress/t/t_var_overwidth_bad.cpp
+++ b/test_regress/t/t_var_overwidth_bad.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
-#include "Vt_var_overwidth_bad.h"
 #include "verilated.h"
 
+#include "Vt_var_overwidth_bad.h"
+
 //======================================================================
 
 double main_time;
diff --git a/test_regress/t/t_vpi_cb_iter.cpp b/test_regress/t/t_vpi_cb_iter.cpp
index 8258385e3..544e1bc62 100644
--- a/test_regress/t/t_vpi_cb_iter.cpp
+++ b/test_regress/t/t_vpi_cb_iter.cpp
@@ -9,22 +9,23 @@
 //
 //*************************************************************************
 
-#include "Vt_vpi_cb_iter.h"
 #include "verilated.h"
 #include "verilated_vpi.h"
 
-#include <cstdlib>
+#include "Vt_vpi_cb_iter.h"
+#include "vpi_user.h"
+
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <vector>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
 #include "TestVpi.h"
 
-#include "vpi_user.h"
-
 int errors = 0;
 
 TestVpiHandle vh_value_cb;
diff --git a/test_regress/t/t_vpi_cbs_called.cpp b/test_regress/t/t_vpi_cbs_called.cpp
index c3e39db12..a2371716a 100644
--- a/test_regress/t/t_vpi_cbs_called.cpp
+++ b/test_regress/t/t_vpi_cbs_called.cpp
@@ -9,21 +9,22 @@
 //
 //*************************************************************************
 
-#include "Vt_vpi_cbs_called.h"
 #include "verilated.h"
 #include "verilated_vpi.h"
 
-#include <cstdlib>
+#include "Vt_vpi_cbs_called.h"
+#include "vpi_user.h"
+
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <vector>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
 
-#include "vpi_user.h"
-
 const std::vector<int> cbs_to_test{cbReadWriteSynch,    cbReadOnlySynch,   cbNextSimTime,
                                    cbStartOfSimulation, cbEndOfSimulation, cbValueChange};
 
diff --git a/test_regress/t/t_vpi_finish_c.cpp b/test_regress/t/t_vpi_finish_c.cpp
index 714bbbe1a..27563051d 100644
--- a/test_regress/t/t_vpi_finish_c.cpp
+++ b/test_regress/t/t_vpi_finish_c.cpp
@@ -9,11 +9,12 @@
 //
 //*************************************************************************
 
-#include <cstdio>
-#include <cstring>
 #include "svdpi.h"
 #include "vpi_user.h"
 
+#include <cstdio>
+#include <cstring>
+
 //======================================================================
 
 extern "C" {
diff --git a/test_regress/t/t_vpi_get.cpp b/test_regress/t/t_vpi_get.cpp
index 20d5d0fd7..fdd93ee01 100644
--- a/test_regress/t/t_vpi_get.cpp
+++ b/test_regress/t/t_vpi_get.cpp
@@ -12,18 +12,18 @@
 #ifdef IS_VPI
 
 #include "vpi_user.h"
+
 #include <cstdlib>
 
 #else
 
-#include "Vt_vpi_get.h"
 #include "verilated.h"
-#include "svdpi.h"
-
-#include "Vt_vpi_get__Dpi.h"
-
-#include "verilated_vpi.h"
 #include "verilated_vcd_c.h"
+#include "verilated_vpi.h"
+
+#include "Vt_vpi_get.h"
+#include "Vt_vpi_get__Dpi.h"
+#include "svdpi.h"
 
 #endif
 
@@ -31,6 +31,7 @@
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
 
diff --git a/test_regress/t/t_vpi_memory.cpp b/test_regress/t/t_vpi_memory.cpp
index e7532b9ad..05a34a68d 100644
--- a/test_regress/t/t_vpi_memory.cpp
+++ b/test_regress/t/t_vpi_memory.cpp
@@ -12,18 +12,18 @@
 #ifdef IS_VPI
 
 #include "vpi_user.h"
+
 #include <cstdlib>
 
 #else
 
-#include "Vt_vpi_memory.h"
 #include "verilated.h"
-#include "svdpi.h"
-
-#include "Vt_vpi_memory__Dpi.h"
-
-#include "verilated_vpi.h"
 #include "verilated_vcd_c.h"
+#include "verilated_vpi.h"
+
+#include "Vt_vpi_memory.h"
+#include "Vt_vpi_memory__Dpi.h"
+#include "svdpi.h"
 
 #endif
 
@@ -31,9 +31,10 @@
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
+#include "TestCheck.h"
 #include "TestSimulator.h"
 #include "TestVpi.h"
-#include "TestCheck.h"
 
 // __FILE__ is too long
 #define FILENM "t_vpi_memory.cpp"
diff --git a/test_regress/t/t_vpi_module.cpp b/test_regress/t/t_vpi_module.cpp
index b09fe6ea7..754cc2660 100644
--- a/test_regress/t/t_vpi_module.cpp
+++ b/test_regress/t/t_vpi_module.cpp
@@ -12,18 +12,18 @@
 #ifdef IS_VPI
 
 #include "vpi_user.h"
+
 #include <cstdlib>
 
 #else
 
-#include "Vt_vpi_module.h"
 #include "verilated.h"
-#include "svdpi.h"
-
-#include "Vt_vpi_module__Dpi.h"
-
-#include "verilated_vpi.h"
 #include "verilated_vcd_c.h"
+#include "verilated_vpi.h"
+
+#include "Vt_vpi_module.h"
+#include "Vt_vpi_module__Dpi.h"
+#include "svdpi.h"
 
 #endif
 
@@ -31,6 +31,7 @@
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
 
diff --git a/test_regress/t/t_vpi_param.cpp b/test_regress/t/t_vpi_param.cpp
index 8ac956531..78f1deeed 100644
--- a/test_regress/t/t_vpi_param.cpp
+++ b/test_regress/t/t_vpi_param.cpp
@@ -12,18 +12,18 @@
 #ifdef IS_VPI
 
 #include "vpi_user.h"
+
 #include <cstdlib>
 
 #else
 
-#include "Vt_vpi_param.h"
 #include "verilated.h"
-#include "svdpi.h"
-
-#include "Vt_vpi_param__Dpi.h"
-
-#include "verilated_vpi.h"
 #include "verilated_vcd_c.h"
+#include "verilated_vpi.h"
+
+#include "Vt_vpi_param.h"
+#include "Vt_vpi_param__Dpi.h"
+#include "svdpi.h"
 
 #endif
 
@@ -31,6 +31,7 @@
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
 
diff --git a/test_regress/t/t_vpi_release_dup_bad_c.cpp b/test_regress/t/t_vpi_release_dup_bad_c.cpp
index 1ade9eaac..d78f3f329 100644
--- a/test_regress/t/t_vpi_release_dup_bad_c.cpp
+++ b/test_regress/t/t_vpi_release_dup_bad_c.cpp
@@ -9,9 +9,10 @@
 //
 //*************************************************************************
 
-#include <cstdio>
 #include "svdpi.h"
 #include "vpi_user.h"
+
+#include <cstdio>
 //#include "verilated.h"
 
 #include "Vt_vpi_release_dup_bad__Dpi.h"
diff --git a/test_regress/t/t_vpi_stop_bad_c.cpp b/test_regress/t/t_vpi_stop_bad_c.cpp
index 12128781c..f66641e1e 100644
--- a/test_regress/t/t_vpi_stop_bad_c.cpp
+++ b/test_regress/t/t_vpi_stop_bad_c.cpp
@@ -9,11 +9,12 @@
 //
 //*************************************************************************
 
-#include <cstdio>
-#include <cstring>
 #include "svdpi.h"
 #include "vpi_user.h"
 
+#include <cstdio>
+#include <cstring>
+
 //======================================================================
 
 extern "C" {
diff --git a/test_regress/t/t_vpi_time_cb.cpp b/test_regress/t/t_vpi_time_cb.cpp
index 1e59a384d..0665e6a10 100644
--- a/test_regress/t/t_vpi_time_cb.cpp
+++ b/test_regress/t/t_vpi_time_cb.cpp
@@ -9,19 +9,19 @@
 //
 //*************************************************************************
 
-#include "Vt_vpi_time_cb.h"
 #include "verilated.h"
+#include "verilated_vcd_c.h"
+#include "verilated_vpi.h"
+
+#include "Vt_vpi_time_cb.h"
+#include "Vt_vpi_time_cb__Dpi.h"
 #include "svdpi.h"
 
-#include "Vt_vpi_time_cb__Dpi.h"
-
-#include "verilated_vpi.h"
-#include "verilated_vcd_c.h"
-
-#include "TestCheck.h"
-
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
+#include "TestCheck.h"
+
 //======================================================================
 
 int main(int argc, char** argv, char** env) {
diff --git a/test_regress/t/t_vpi_time_cb_c.cpp b/test_regress/t/t_vpi_time_cb_c.cpp
index c6a82aae3..f25e08445 100644
--- a/test_regress/t/t_vpi_time_cb_c.cpp
+++ b/test_regress/t/t_vpi_time_cb_c.cpp
@@ -11,11 +11,12 @@
 
 #include "vpi_user.h"
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_unimpl.cpp b/test_regress/t/t_vpi_unimpl.cpp
index e8359ba45..549d66e1e 100644
--- a/test_regress/t/t_vpi_unimpl.cpp
+++ b/test_regress/t/t_vpi_unimpl.cpp
@@ -9,17 +9,17 @@
 //
 //*************************************************************************
 
-#include "Vt_vpi_unimpl.h"
 #include "verilated.h"
-#include "svdpi.h"
-
-#include "Vt_vpi_unimpl__Dpi.h"
-
 #include "verilated_vcd_c.h"
+
+#include "Vt_vpi_unimpl.h"
+#include "Vt_vpi_unimpl__Dpi.h"
+#include "svdpi.h"
 // No verilated_vpi.h, make sure can link without it
 
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestVpi.h"
 
 // __FILE__ is too long
diff --git a/test_regress/t/t_vpi_var.cpp b/test_regress/t/t_vpi_var.cpp
index f2c4dfa8f..5666bb3fd 100644
--- a/test_regress/t/t_vpi_var.cpp
+++ b/test_regress/t/t_vpi_var.cpp
@@ -15,25 +15,26 @@
 
 #else
 
-#include "Vt_vpi_var.h"
 #include "verilated.h"
-#include "svdpi.h"
-
-#include "Vt_vpi_var__Dpi.h"
-
-#include "verilated_vpi.h"
 #include "verilated_vcd_c.h"
+#include "verilated_vpi.h"
+
+#include "Vt_vpi_var.h"
+#include "Vt_vpi_var__Dpi.h"
+#include "svdpi.h"
 
 #endif
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
 
+int errors = 0;
 // __FILE__ is too long
 #define FILENM "t_vpi_var.cpp"
 
diff --git a/test_regress/t/t_vpi_zero_time_cb.cpp b/test_regress/t/t_vpi_zero_time_cb.cpp
index 0427ac226..56eea28ab 100644
--- a/test_regress/t/t_vpi_zero_time_cb.cpp
+++ b/test_regress/t/t_vpi_zero_time_cb.cpp
@@ -15,23 +15,24 @@
 
 #else
 
-#include "Vt_vpi_zero_time_cb.h"
 #include "verilated.h"
-#include "svdpi.h"
-#include <dlfcn.h>
-
-#include "Vt_vpi_zero_time_cb__Dpi.h"
-
-#include "verilated_vpi.h"
 #include "verilated_vcd_c.h"
+#include "verilated_vpi.h"
+
+#include "Vt_vpi_zero_time_cb.h"
+#include "Vt_vpi_zero_time_cb__Dpi.h"
+#include "svdpi.h"
+
+#include <dlfcn.h>
 
 #endif
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_wrapper_context.cpp b/test_regress/t/t_wrapper_context.cpp
index 31a9334f0..b802e6787 100644
--- a/test_regress/t/t_wrapper_context.cpp
+++ b/test_regress/t/t_wrapper_context.cpp
@@ -6,11 +6,13 @@
 // SPDX-License-Identifier: CC0-1.0
 //
 
+#include <verilated.h>
+#include <verilated_cov.h>
+
 #include <iostream>
 #include <thread>
 
-#include <verilated.h>
-#include <verilated_cov.h>
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 #include VM_PREFIX_INCLUDE
diff --git a/test_regress/t/t_wrapper_legacy.cpp b/test_regress/t/t_wrapper_legacy.cpp
index 6b123aed7..860e1a442 100644
--- a/test_regress/t/t_wrapper_legacy.cpp
+++ b/test_regress/t/t_wrapper_legacy.cpp
@@ -11,11 +11,12 @@
 
 #include VM_PREFIX_INCLUDE
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 
+// These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 
 int errors = 0;
diff --git a/test_regress/t/t_x_assign.cpp b/test_regress/t/t_x_assign.cpp
index 9ab268a4f..85aa51797 100644
--- a/test_regress/t/t_x_assign.cpp
+++ b/test_regress/t/t_x_assign.cpp
@@ -9,9 +9,9 @@
 //
 //*************************************************************************
 
-#include <iostream>
-
 #include "verilated.h"
+
+#include <iostream>
 #include VM_PREFIX_INCLUDE
 
 double sc_time_stamp() { return 0; }