From be31fdcfe4f8bc2f2fbffd36f0689868adca35c6 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Wed, 3 Mar 2021 21:57:07 -0500
Subject: [PATCH] Use Google-style-guide header guard naming, to avoid __
 prefix.

---
 include/verilated.cpp          | 2 +-
 include/verilated.h            | 4 ++--
 include/verilated_cov.h        | 4 ++--
 include/verilated_cov_key.h    | 4 ++--
 include/verilated_dpi.cpp      | 2 +-
 include/verilated_dpi.h        | 4 ++--
 include/verilated_fst_c.h      | 4 ++--
 include/verilated_heavy.h      | 4 ++--
 include/verilated_imp.h        | 6 +++---
 include/verilated_intrinsics.h | 4 ++--
 include/verilated_save.h       | 4 ++--
 include/verilated_sc.h         | 4 ++--
 include/verilated_sym_props.h  | 4 ++--
 include/verilated_syms.h       | 4 ++--
 include/verilated_threads.h    | 4 ++--
 include/verilated_trace.h      | 4 ++--
 include/verilated_vcd_c.h      | 4 ++--
 include/verilated_vcd_sc.h     | 4 ++--
 include/verilated_vpi.cpp      | 2 +-
 include/verilated_vpi.h        | 4 ++--
 include/verilatedos.h          | 4 ++--
 src/V3Active.h                 | 4 ++--
 src/V3ActiveTop.h              | 4 ++--
 src/V3Assert.h                 | 4 ++--
 src/V3AssertPre.h              | 4 ++--
 src/V3Ast.h                    | 4 ++--
 src/V3AstConstOnly.h           | 4 ++--
 src/V3AstNodes.h               | 6 +++---
 src/V3Begin.h                  | 4 ++--
 src/V3Branch.h                 | 4 ++--
 src/V3Broken.h                 | 4 ++--
 src/V3CCtors.h                 | 4 ++--
 src/V3CUse.h                   | 4 ++--
 src/V3Case.h                   | 4 ++--
 src/V3Cast.h                   | 4 ++--
 src/V3Cdc.h                    | 4 ++--
 src/V3Changed.h                | 4 ++--
 src/V3Class.h                  | 4 ++--
 src/V3Clean.h                  | 4 ++--
 src/V3Clock.h                  | 4 ++--
 src/V3Combine.h                | 4 ++--
 src/V3Config.h                 | 4 ++--
 src/V3Const.h                  | 4 ++--
 src/V3Coverage.h               | 4 ++--
 src/V3CoverageJoin.h           | 4 ++--
 src/V3Dead.h                   | 4 ++--
 src/V3Delayed.h                | 4 ++--
 src/V3Depth.h                  | 4 ++--
 src/V3DepthBlock.h             | 4 ++--
 src/V3Descope.h                | 4 ++--
 src/V3EmitC.h                  | 4 ++--
 src/V3EmitCBase.h              | 4 ++--
 src/V3EmitCMain.h              | 4 ++--
 src/V3EmitCMake.h              | 4 ++--
 src/V3EmitMk.h                 | 4 ++--
 src/V3EmitV.h                  | 4 ++--
 src/V3EmitXml.h                | 4 ++--
 src/V3Error.h                  | 4 ++--
 src/V3Expand.h                 | 4 ++--
 src/V3File.cpp                 | 2 +-
 src/V3File.h                   | 4 ++--
 src/V3FileLine.h               | 4 ++--
 src/V3Gate.h                   | 4 ++--
 src/V3GenClk.h                 | 4 ++--
 src/V3Global.h                 | 4 ++--
 src/V3Graph.h                  | 4 ++--
 src/V3GraphAlg.h               | 4 ++--
 src/V3GraphDfa.h               | 4 ++--
 src/V3GraphPathChecker.h       | 4 ++--
 src/V3GraphStream.h            | 4 ++--
 src/V3Hashed.h                 | 4 ++--
 src/V3HierBlock.h              | 4 ++--
 src/V3Inline.h                 | 4 ++--
 src/V3Inst.h                   | 4 ++--
 src/V3InstrCount.h             | 4 ++--
 src/V3LangCode.h               | 4 ++--
 src/V3LanguageWords.h          | 4 ++--
 src/V3Life.h                   | 4 ++--
 src/V3LifePost.h               | 4 ++--
 src/V3LinkCells.h              | 4 ++--
 src/V3LinkDot.h                | 4 ++--
 src/V3LinkInc.h                | 4 ++--
 src/V3LinkJump.h               | 4 ++--
 src/V3LinkLValue.h             | 4 ++--
 src/V3LinkLevel.h              | 4 ++--
 src/V3LinkParse.h              | 4 ++--
 src/V3LinkResolve.h            | 4 ++--
 src/V3List.h                   | 4 ++--
 src/V3Localize.h               | 4 ++--
 src/V3MergeCond.h              | 4 ++--
 src/V3Name.h                   | 4 ++--
 src/V3Number.h                 | 4 ++--
 src/V3Options.h                | 4 ++--
 src/V3Order.h                  | 4 ++--
 src/V3OrderGraph.h             | 4 ++--
 src/V3Os.h                     | 4 ++--
 src/V3Param.h                  | 4 ++--
 src/V3Parse.h                  | 4 ++--
 src/V3ParseImp.h               | 4 ++--
 src/V3ParseSym.h               | 4 ++--
 src/V3Partition.h              | 4 ++--
 src/V3PartitionGraph.h         | 4 ++--
 src/V3PreLex.h                 | 4 ++--
 src/V3PreProc.h                | 4 ++--
 src/V3PreShell.h               | 4 ++--
 src/V3Premit.h                 | 4 ++--
 src/V3ProtectLib.h             | 4 ++--
 src/V3Randomize.h              | 4 ++--
 src/V3Reloop.h                 | 4 ++--
 src/V3Scope.h                  | 4 ++--
 src/V3Scoreboard.h             | 4 ++--
 src/V3SenTree.h                | 4 ++--
 src/V3Simulate.h               | 4 ++--
 src/V3Slice.h                  | 4 ++--
 src/V3Split.h                  | 4 ++--
 src/V3SplitAs.h                | 4 ++--
 src/V3SplitVar.h               | 4 ++--
 src/V3Stats.h                  | 4 ++--
 src/V3String.h                 | 4 ++--
 src/V3Subst.h                  | 4 ++--
 src/V3SymTable.h               | 4 ++--
 src/V3TSP.h                    | 4 ++--
 src/V3Table.h                  | 4 ++--
 src/V3Task.h                   | 4 ++--
 src/V3Trace.h                  | 4 ++--
 src/V3TraceDecl.h              | 4 ++--
 src/V3Tristate.h               | 4 ++--
 src/V3Undriven.h               | 4 ++--
 src/V3Unknown.h                | 4 ++--
 src/V3Unroll.h                 | 4 ++--
 src/V3Waiver.h                 | 4 ++--
 src/V3Width.cpp                | 2 +-
 src/V3Width.h                  | 4 ++--
 src/V3WidthCommit.h            | 6 +++---
 src/VlcBucket.h                | 4 ++--
 src/VlcOptions.h               | 4 ++--
 src/VlcPoint.h                 | 4 ++--
 src/VlcSource.h                | 4 ++--
 src/VlcTest.h                  | 4 ++--
 src/VlcTop.h                   | 4 ++--
 140 files changed, 278 insertions(+), 278 deletions(-)

diff --git a/include/verilated.cpp b/include/verilated.cpp
index 78b604b75..ca4cb6dd5 100644
--- a/include/verilated.cpp
+++ b/include/verilated.cpp
@@ -19,7 +19,7 @@
 ///
 //=========================================================================
 
-#define _VERILATED_CPP_
+#define VERILATOR_VERILATED_CPP_
 
 #include "verilatedos.h"
 #include "verilated_imp.h"
diff --git a/include/verilated.h b/include/verilated.h
index d8126acb7..856c04af7 100644
--- a/include/verilated.h
+++ b/include/verilated.h
@@ -20,8 +20,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATED_H_
-#define _VERILATED_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_H_
+#define VERILATOR_VERILATED_H_  ///< Header Guard
 
 // clang-format off
 #include "verilatedos.h"
diff --git a/include/verilated_cov.h b/include/verilated_cov.h
index 4fd213a7d..048426765 100644
--- a/include/verilated_cov.h
+++ b/include/verilated_cov.h
@@ -16,8 +16,8 @@
 ///
 //=============================================================================
 
-#ifndef _VERILATED_COV_H_
-#define _VERILATED_COV_H_ 1
+#ifndef VERILATOR_VERILATED_COV_H_
+#define VERILATOR_VERILATED_COV_H_
 
 #include "verilatedos.h"
 
diff --git a/include/verilated_cov_key.h b/include/verilated_cov_key.h
index 21e64b308..e0dad8c61 100644
--- a/include/verilated_cov_key.h
+++ b/include/verilated_cov_key.h
@@ -16,8 +16,8 @@
 ///
 //=============================================================================
 
-#ifndef _VERILATED_COV_KEY_H_
-#define _VERILATED_COV_KEY_H_ 1
+#ifndef VERILATOR_VERILATED_COV_KEY_H_
+#define VERILATOR_VERILATED_COV_KEY_H_
 
 #include "verilatedos.h"
 
diff --git a/include/verilated_dpi.cpp b/include/verilated_dpi.cpp
index 816b92c2e..5926da182 100644
--- a/include/verilated_dpi.cpp
+++ b/include/verilated_dpi.cpp
@@ -19,7 +19,7 @@
 ///
 //=========================================================================
 
-#define _VERILATED_DPI_CPP_
+#define VERILATOR_VERILATED_DPI_CPP_
 
 #include "verilatedos.h"
 #include "verilated_dpi.h"
diff --git a/include/verilated_dpi.h b/include/verilated_dpi.h
index 3b9744ee4..c2c01cd61 100644
--- a/include/verilated_dpi.h
+++ b/include/verilated_dpi.h
@@ -20,8 +20,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATED_DPI_H_
-#define _VERILATED_DPI_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_DPI_H_
+#define VERILATOR_VERILATED_DPI_H_  ///< Header Guard
 
 #include "verilatedos.h"
 #include "verilated.h"  // Also presumably included by caller
diff --git a/include/verilated_fst_c.h b/include/verilated_fst_c.h
index f21a6087c..0e85e1ed1 100644
--- a/include/verilated_fst_c.h
+++ b/include/verilated_fst_c.h
@@ -17,8 +17,8 @@
 //=============================================================================
 // SPDIFF_OFF
 
-#ifndef _VERILATED_FST_C_H_
-#define _VERILATED_FST_C_H_ 1
+#ifndef VERILATOR_VERILATED_FST_C_H_
+#define VERILATOR_VERILATED_FST_C_H_
 
 #include "verilated.h"
 #include "verilated_trace.h"
diff --git a/include/verilated_heavy.h b/include/verilated_heavy.h
index 91d2272ae..cf86d4be7 100644
--- a/include/verilated_heavy.h
+++ b/include/verilated_heavy.h
@@ -21,8 +21,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATED_HEAVY_H_
-#define _VERILATED_HEAVY_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_HEAVY_H_
+#define VERILATOR_VERILATED_HEAVY_H_  ///< Header Guard
 
 #include "verilated.h"
 
diff --git a/include/verilated_imp.h b/include/verilated_imp.h
index e9f343a16..97901fa2a 100644
--- a/include/verilated_imp.h
+++ b/include/verilated_imp.h
@@ -16,11 +16,11 @@
 ///
 //=========================================================================
 
-#ifndef _VERILATED_IMP_H_
-#define _VERILATED_IMP_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_IMP_H_
+#define VERILATOR_VERILATED_IMP_H_  ///< Header Guard
 
 // clang-format off
-#if !defined(_VERILATED_CPP_) && !defined(_VERILATED_DPI_CPP_) && !defined(_VERILATED_VPI_CPP_)
+#if !defined(VERILATOR_VERILATED_CPP_) && !defined(VERILATOR_VERILATED_DPI_CPP_) && !defined(VERILATOR_VERILATED_VPI_CPP_)
 # error "verilated_imp.h only to be included by verilated*.cpp internals"
 #endif
 
diff --git a/include/verilated_intrinsics.h b/include/verilated_intrinsics.h
index 4deea30e1..bba2a324c 100644
--- a/include/verilated_intrinsics.h
+++ b/include/verilated_intrinsics.h
@@ -19,8 +19,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATED_INTRINSICS_H_
-#define _VERILATED_INTRINSICS_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_INTRINSICS_H_
+#define VERILATOR_VERILATED_INTRINSICS_H_  ///< Header Guard
 
 // clang-format off
 
diff --git a/include/verilated_save.h b/include/verilated_save.h
index e39ca820e..d66757c7f 100644
--- a/include/verilated_save.h
+++ b/include/verilated_save.h
@@ -16,8 +16,8 @@
 ///
 //=============================================================================
 
-#ifndef _VERILATED_SAVE_C_H_
-#define _VERILATED_SAVE_C_H_ 1
+#ifndef VERILATOR_VERILATED_SAVE_C_H_
+#define VERILATOR_VERILATED_SAVE_C_H_
 
 #include "verilatedos.h"
 #include "verilated_heavy.h"
diff --git a/include/verilated_sc.h b/include/verilated_sc.h
index 31884ba53..ed88081f3 100644
--- a/include/verilated_sc.h
+++ b/include/verilated_sc.h
@@ -19,8 +19,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATED_SC_H_
-#define _VERILATED_SC_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_SC_H_
+#define VERILATOR_VERILATED_SC_H_  ///< Header Guard
 
 #include "verilatedos.h"
 
diff --git a/include/verilated_sym_props.h b/include/verilated_sym_props.h
index 41d0b3193..f66cc92c1 100644
--- a/include/verilated_sym_props.h
+++ b/include/verilated_sym_props.h
@@ -24,8 +24,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATED_SYM_PROPS_H_
-#define _VERILATED_SYM_PROPS_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_SYM_PROPS_H_
+#define VERILATOR_VERILATED_SYM_PROPS_H_  ///< Header Guard
 
 #include "verilatedos.h"
 
diff --git a/include/verilated_syms.h b/include/verilated_syms.h
index 191ad5014..72f294c45 100644
--- a/include/verilated_syms.h
+++ b/include/verilated_syms.h
@@ -23,8 +23,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATED_SYMS_H_
-#define _VERILATED_SYMS_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_SYMS_H_
+#define VERILATOR_VERILATED_SYMS_H_  ///< Header Guard
 
 #include "verilatedos.h"
 #include "verilated_heavy.h"
diff --git a/include/verilated_threads.h b/include/verilated_threads.h
index b502d9971..0a04ae380 100644
--- a/include/verilated_threads.h
+++ b/include/verilated_threads.h
@@ -16,8 +16,8 @@
 ///
 //=============================================================================
 
-#ifndef _VERILATED_THREADS_H_
-#define _VERILATED_THREADS_H_
+#ifndef VERILATOR_VERILATED_THREADS_H_
+#define VERILATOR_VERILATED_THREADS_H_
 
 #include "verilatedos.h"
 #include "verilated.h"  // for VerilatedMutex and clang annotations
diff --git a/include/verilated_trace.h b/include/verilated_trace.h
index feb261606..fb7cbe90a 100644
--- a/include/verilated_trace.h
+++ b/include/verilated_trace.h
@@ -17,8 +17,8 @@
 //=============================================================================
 // SPDIFF_OFF
 
-#ifndef _VERILATED_TRACE_H_
-#define _VERILATED_TRACE_H_ 1
+#ifndef VERILATOR_VERILATED_TRACE_H_
+#define VERILATOR_VERILATED_TRACE_H_
 
 // clang-format off
 
diff --git a/include/verilated_vcd_c.h b/include/verilated_vcd_c.h
index ec42fae9b..a2503339a 100644
--- a/include/verilated_vcd_c.h
+++ b/include/verilated_vcd_c.h
@@ -17,8 +17,8 @@
 //=============================================================================
 // SPDIFF_OFF
 
-#ifndef _VERILATED_VCD_C_H_
-#define _VERILATED_VCD_C_H_ 1
+#ifndef VERILATOR_VERILATED_VCD_C_H_
+#define VERILATOR_VERILATED_VCD_C_H_
 
 #include "verilated.h"
 #include "verilated_trace.h"
diff --git a/include/verilated_vcd_sc.h b/include/verilated_vcd_sc.h
index c18840541..3568d6d17 100644
--- a/include/verilated_vcd_sc.h
+++ b/include/verilated_vcd_sc.h
@@ -17,8 +17,8 @@
 //=============================================================================
 // SPDIFF_OFF
 
-#ifndef _VERILATED_VCD_SC_H_
-#define _VERILATED_VCD_SC_H_ 1
+#ifndef VERILATOR_VERILATED_VCD_SC_H_
+#define VERILATOR_VERILATED_VCD_SC_H_
 
 #include "verilatedos.h"
 #include "verilated_sc.h"
diff --git a/include/verilated_vpi.cpp b/include/verilated_vpi.cpp
index e48809e54..bd2a186f3 100644
--- a/include/verilated_vpi.cpp
+++ b/include/verilated_vpi.cpp
@@ -21,7 +21,7 @@
 ///
 //=========================================================================
 
-#define _VERILATED_VPI_CPP_
+#define VERILATOR_VERILATED_VPI_CPP_
 
 #include "verilated.h"
 #include "verilated_vpi.h"
diff --git a/include/verilated_vpi.h b/include/verilated_vpi.h
index 9efa044e8..c7b5946aa 100644
--- a/include/verilated_vpi.h
+++ b/include/verilated_vpi.h
@@ -19,8 +19,8 @@
 ///
 //=========================================================================
 
-#ifndef _VERILATED_VPI_H_
-#define _VERILATED_VPI_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATED_VPI_H_
+#define VERILATOR_VERILATED_VPI_H_  ///< Header Guard
 
 #include "verilatedos.h"
 #include "verilated.h"
diff --git a/include/verilatedos.h b/include/verilatedos.h
index b83d5f1bc..5b803212c 100644
--- a/include/verilatedos.h
+++ b/include/verilatedos.h
@@ -22,8 +22,8 @@
 ///
 //*************************************************************************
 
-#ifndef _VERILATEDOS_H_
-#define _VERILATEDOS_H_ 1  ///< Header Guard
+#ifndef VERILATOR_VERILATEDOS_H_
+#define VERILATOR_VERILATEDOS_H_  ///< Header Guard
 
 // Current clang-format versions botch #ifdef inclusion, so
 // clang-format off
diff --git a/src/V3Active.h b/src/V3Active.h
index bec002ce1..31fca4e4f 100644
--- a/src/V3Active.h
+++ b/src/V3Active.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3ACTIVE_H_
-#define _V3ACTIVE_H_ 1
+#ifndef VERILATOR_V3ACTIVE_H_
+#define VERILATOR_V3ACTIVE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3ActiveTop.h b/src/V3ActiveTop.h
index 567d29314..b17427244 100644
--- a/src/V3ActiveTop.h
+++ b/src/V3ActiveTop.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3ACTIVETOP_H_
-#define _V3ACTIVETOP_H_ 1
+#ifndef VERILATOR_V3ACTIVETOP_H_
+#define VERILATOR_V3ACTIVETOP_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Assert.h b/src/V3Assert.h
index 2738ddbf2..29a600628 100644
--- a/src/V3Assert.h
+++ b/src/V3Assert.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3ASSERT_H_
-#define _V3ASSERT_H_ 1
+#ifndef VERILATOR_V3ASSERT_H_
+#define VERILATOR_V3ASSERT_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3AssertPre.h b/src/V3AssertPre.h
index 0b5acb522..7c277d76e 100644
--- a/src/V3AssertPre.h
+++ b/src/V3AssertPre.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3ASSERTPRE_H_
-#define _V3ASSERTPRE_H_ 1
+#ifndef VERILATOR_V3ASSERTPRE_H_
+#define VERILATOR_V3ASSERTPRE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Ast.h b/src/V3Ast.h
index 258fb40c5..fa9e03d79 100644
--- a/src/V3Ast.h
+++ b/src/V3Ast.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3AST_H_
-#define _V3AST_H_ 1
+#ifndef VERILATOR_V3AST_H_
+#define VERILATOR_V3AST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3AstConstOnly.h b/src/V3AstConstOnly.h
index c686d429c..58def6b0a 100644
--- a/src/V3AstConstOnly.h
+++ b/src/V3AstConstOnly.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3ASTCONSTONLY_H_
-#define _V3ASTCONSTONLY_H_ 1
+#ifndef VERILATOR_V3ASTCONSTONLY_H_
+#define VERILATOR_V3ASTCONSTONLY_H_
 
 // Include only in visitors that do not not edit nodes, so should use constant iterators
 #define iterateAndNext error_use_iterateAndNextConst
diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h
index efaca0cec..ae7a23f27 100644
--- a/src/V3AstNodes.h
+++ b/src/V3AstNodes.h
@@ -14,10 +14,10 @@
 //
 //*************************************************************************
 
-#ifndef _V3ASTNODES_H_
-#define _V3ASTNODES_H_ 1
+#ifndef VERILATOR_V3ASTNODES_H_
+#define VERILATOR_V3ASTNODES_H_
 
-#ifndef _V3AST_H_
+#ifndef VERILATOR_V3AST_H_
 #error "Use V3Ast.h as the include"
 #endif
 
diff --git a/src/V3Begin.h b/src/V3Begin.h
index 3962ce5e8..b1ca0c3fe 100644
--- a/src/V3Begin.h
+++ b/src/V3Begin.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3BEGIN_H_
-#define _V3BEGIN_H_ 1
+#ifndef VERILATOR_V3BEGIN_H_
+#define VERILATOR_V3BEGIN_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Branch.h b/src/V3Branch.h
index fd3a0736f..d693f6488 100644
--- a/src/V3Branch.h
+++ b/src/V3Branch.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3BRANCH_H_
-#define _V3BRANCH_H_ 1
+#ifndef VERILATOR_V3BRANCH_H_
+#define VERILATOR_V3BRANCH_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Broken.h b/src/V3Broken.h
index 88d87ce3e..16103baa0 100644
--- a/src/V3Broken.h
+++ b/src/V3Broken.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3BROKEN_H_
-#define _V3BROKEN_H_ 1
+#ifndef VERILATOR_V3BROKEN_H_
+#define VERILATOR_V3BROKEN_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3CCtors.h b/src/V3CCtors.h
index c5590ae52..f48652ed9 100644
--- a/src/V3CCtors.h
+++ b/src/V3CCtors.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CCTORS_H_
-#define _V3CCTORS_H_ 1
+#ifndef VERILATOR_V3CCTORS_H_
+#define VERILATOR_V3CCTORS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3CUse.h b/src/V3CUse.h
index ec5028c37..f2ec4afbb 100644
--- a/src/V3CUse.h
+++ b/src/V3CUse.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CUSE_H_
-#define _V3CUSE_H_ 1
+#ifndef VERILATOR_V3CUSE_H_
+#define VERILATOR_V3CUSE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Case.h b/src/V3Case.h
index 001c063ea..0c503d8bc 100644
--- a/src/V3Case.h
+++ b/src/V3Case.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CASE_H_
-#define _V3CASE_H_ 1
+#ifndef VERILATOR_V3CASE_H_
+#define VERILATOR_V3CASE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Cast.h b/src/V3Cast.h
index 8d35af3ef..b73cb52da 100644
--- a/src/V3Cast.h
+++ b/src/V3Cast.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CAST_H_
-#define _V3CAST_H_ 1
+#ifndef VERILATOR_V3CAST_H_
+#define VERILATOR_V3CAST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Cdc.h b/src/V3Cdc.h
index 549474d30..cc3470d30 100644
--- a/src/V3Cdc.h
+++ b/src/V3Cdc.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CDC_H_
-#define _V3CDC_H_ 1
+#ifndef VERILATOR_V3CDC_H_
+#define VERILATOR_V3CDC_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Changed.h b/src/V3Changed.h
index 2646a1084..48d96a58b 100644
--- a/src/V3Changed.h
+++ b/src/V3Changed.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CHANGED_H_
-#define _V3CHANGED_H_ 1
+#ifndef VERILATOR_V3CHANGED_H_
+#define VERILATOR_V3CHANGED_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Class.h b/src/V3Class.h
index d9da9dcb3..10902fe06 100644
--- a/src/V3Class.h
+++ b/src/V3Class.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CLASS_H_
-#define _V3CLASS_H_ 1
+#ifndef VERILATOR_V3CLASS_H_
+#define VERILATOR_V3CLASS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Clean.h b/src/V3Clean.h
index 4ca00a58a..6ba7364ba 100644
--- a/src/V3Clean.h
+++ b/src/V3Clean.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CLEAN_H_
-#define _V3CLEAN_H_ 1
+#ifndef VERILATOR_V3CLEAN_H_
+#define VERILATOR_V3CLEAN_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Clock.h b/src/V3Clock.h
index cdda29e18..4186ec1f6 100644
--- a/src/V3Clock.h
+++ b/src/V3Clock.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CLOCK_H_
-#define _V3CLOCK_H_ 1
+#ifndef VERILATOR_V3CLOCK_H_
+#define VERILATOR_V3CLOCK_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Combine.h b/src/V3Combine.h
index fb2b99c07..6e510dd05 100644
--- a/src/V3Combine.h
+++ b/src/V3Combine.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3COMBINE_H_
-#define _V3COMBINE_H_ 1
+#ifndef VERILATOR_V3COMBINE_H_
+#define VERILATOR_V3COMBINE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Config.h b/src/V3Config.h
index c86c60e83..470827fdf 100644
--- a/src/V3Config.h
+++ b/src/V3Config.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CONFIG_H_
-#define _V3CONFIG_H_ 1
+#ifndef VERILATOR_V3CONFIG_H_
+#define VERILATOR_V3CONFIG_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Const.h b/src/V3Const.h
index 6ccd67713..11e50cc03 100644
--- a/src/V3Const.h
+++ b/src/V3Const.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3CONST_H_
-#define _V3CONST_H_ 1
+#ifndef VERILATOR_V3CONST_H_
+#define VERILATOR_V3CONST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Coverage.h b/src/V3Coverage.h
index 12c20e76a..1b2cc7c40 100644
--- a/src/V3Coverage.h
+++ b/src/V3Coverage.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3COVERAGE_H_
-#define _V3COVERAGE_H_ 1
+#ifndef VERILATOR_V3COVERAGE_H_
+#define VERILATOR_V3COVERAGE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3CoverageJoin.h b/src/V3CoverageJoin.h
index ef1a7fc7e..5b52eb3ff 100644
--- a/src/V3CoverageJoin.h
+++ b/src/V3CoverageJoin.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3COVERAGEJOIN_H_
-#define _V3COVERAGEJOIN_H_ 1
+#ifndef VERILATOR_V3COVERAGEJOIN_H_
+#define VERILATOR_V3COVERAGEJOIN_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Dead.h b/src/V3Dead.h
index c0f656dee..409b7ac52 100644
--- a/src/V3Dead.h
+++ b/src/V3Dead.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3DEAD_H_
-#define _V3DEAD_H_ 1
+#ifndef VERILATOR_V3DEAD_H_
+#define VERILATOR_V3DEAD_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Delayed.h b/src/V3Delayed.h
index 4e8080bb5..745dbb8c6 100644
--- a/src/V3Delayed.h
+++ b/src/V3Delayed.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3DELAYED_H_
-#define _V3DELAYED_H_ 1
+#ifndef VERILATOR_V3DELAYED_H_
+#define VERILATOR_V3DELAYED_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Depth.h b/src/V3Depth.h
index 355848da3..09f43c33c 100644
--- a/src/V3Depth.h
+++ b/src/V3Depth.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3DEPTH_H_
-#define _V3DEPTH_H_ 1
+#ifndef VERILATOR_V3DEPTH_H_
+#define VERILATOR_V3DEPTH_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3DepthBlock.h b/src/V3DepthBlock.h
index 964c91234..bbc04d7a6 100644
--- a/src/V3DepthBlock.h
+++ b/src/V3DepthBlock.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3DEPTHBLOCK_H_
-#define _V3DEPTHBLOCK_H_ 1
+#ifndef VERILATOR_V3DEPTHBLOCK_H_
+#define VERILATOR_V3DEPTHBLOCK_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Descope.h b/src/V3Descope.h
index 07896ce16..9f3fc6ce6 100644
--- a/src/V3Descope.h
+++ b/src/V3Descope.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3DESCOPE_H_
-#define _V3DESCOPE_H_ 1
+#ifndef VERILATOR_V3DESCOPE_H_
+#define VERILATOR_V3DESCOPE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3EmitC.h b/src/V3EmitC.h
index fb75a1626..0e4207c6a 100644
--- a/src/V3EmitC.h
+++ b/src/V3EmitC.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EMITC_H_
-#define _V3EMITC_H_ 1
+#ifndef VERILATOR_V3EMITC_H_
+#define VERILATOR_V3EMITC_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3EmitCBase.h b/src/V3EmitCBase.h
index cc75859f9..6b448916a 100644
--- a/src/V3EmitCBase.h
+++ b/src/V3EmitCBase.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EMITCBASE_H_
-#define _V3EMITCBASE_H_ 1
+#ifndef VERILATOR_V3EMITCBASE_H_
+#define VERILATOR_V3EMITCBASE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3EmitCMain.h b/src/V3EmitCMain.h
index d5232baaa..e9f936ea5 100644
--- a/src/V3EmitCMain.h
+++ b/src/V3EmitCMain.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EMITCMAIN_H_
-#define _V3EMITCMAIN_H_ 1
+#ifndef VERILATOR_V3EMITCMAIN_H_
+#define VERILATOR_V3EMITCMAIN_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3EmitCMake.h b/src/V3EmitCMake.h
index 3401887f4..d62d73d42 100644
--- a/src/V3EmitCMake.h
+++ b/src/V3EmitCMake.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EMITCMAKE_H_
-#define _V3EMITCMAKE_H_ 1
+#ifndef VERILATOR_V3EMITCMAKE_H_
+#define VERILATOR_V3EMITCMAKE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3EmitMk.h b/src/V3EmitMk.h
index c9208059d..26a01e786 100644
--- a/src/V3EmitMk.h
+++ b/src/V3EmitMk.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EMITMK_H_
-#define _V3EMITMK_H_ 1
+#ifndef VERILATOR_V3EMITMK_H_
+#define VERILATOR_V3EMITMK_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3EmitV.h b/src/V3EmitV.h
index 17cb790ad..8c3008b67 100644
--- a/src/V3EmitV.h
+++ b/src/V3EmitV.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EMITV_H_
-#define _V3EMITV_H_ 1
+#ifndef VERILATOR_V3EMITV_H_
+#define VERILATOR_V3EMITV_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3EmitXml.h b/src/V3EmitXml.h
index e1b790736..a1ac36b1f 100644
--- a/src/V3EmitXml.h
+++ b/src/V3EmitXml.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EMITXML_H_
-#define _V3EMITXML_H_ 1
+#ifndef VERILATOR_V3EMITXML_H_
+#define VERILATOR_V3EMITXML_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Error.h b/src/V3Error.h
index 374bc4415..89e9878c1 100644
--- a/src/V3Error.h
+++ b/src/V3Error.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3ERROR_H_
-#define _V3ERROR_H_ 1
+#ifndef VERILATOR_V3ERROR_H_
+#define VERILATOR_V3ERROR_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Expand.h b/src/V3Expand.h
index d405479fa..5ea9e9a3d 100644
--- a/src/V3Expand.h
+++ b/src/V3Expand.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3EXPAND_H_
-#define _V3EXPAND_H_ 1
+#ifndef VERILATOR_V3EXPAND_H_
+#define VERILATOR_V3EXPAND_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3File.cpp b/src/V3File.cpp
index 9b39bd425..a9be42ed6 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -938,7 +938,7 @@ void V3OutFile::putsForceIncs() {
 void V3OutCFile::putsGuard() {
     UASSERT(!m_guard, "Already called putsGuard in emit file");
     m_guard = true;
-    string var = VString::upcase(string("_") + V3Os::filenameNonDir(filename()) + "_");
+    string var = VString::upcase(string("VERILATED_") + V3Os::filenameNonDir(filename()) + "_");
     for (char& c : var) {
         if (!isalnum(c)) c = '_';
     }
diff --git a/src/V3File.h b/src/V3File.h
index c94404224..35df9efbe 100644
--- a/src/V3File.h
+++ b/src/V3File.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3FILE_H_
-#define _V3FILE_H_ 1
+#ifndef VERILATOR_V3FILE_H_
+#define VERILATOR_V3FILE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3FileLine.h b/src/V3FileLine.h
index bbc0c2de2..983554aaf 100644
--- a/src/V3FileLine.h
+++ b/src/V3FileLine.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3FILELINE_H_
-#define _V3FILELINE_H_ 1
+#ifndef VERILATOR_V3FILELINE_H_
+#define VERILATOR_V3FILELINE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Gate.h b/src/V3Gate.h
index 1cc55cc9b..4aa2d351e 100644
--- a/src/V3Gate.h
+++ b/src/V3Gate.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GATE_H_
-#define _V3GATE_H_ 1
+#ifndef VERILATOR_V3GATE_H_
+#define VERILATOR_V3GATE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3GenClk.h b/src/V3GenClk.h
index 031f76b3c..3ac306bc5 100644
--- a/src/V3GenClk.h
+++ b/src/V3GenClk.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GENCLK_H_
-#define _V3GENCLK_H_ 1
+#ifndef VERILATOR_V3GENCLK_H_
+#define VERILATOR_V3GENCLK_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Global.h b/src/V3Global.h
index a8da68308..f2b028038 100644
--- a/src/V3Global.h
+++ b/src/V3Global.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GLOBAL_H_
-#define _V3GLOBAL_H_ 1
+#ifndef VERILATOR_V3GLOBAL_H_
+#define VERILATOR_V3GLOBAL_H_
 
 // clang-format off
 #include "config_build.h"
diff --git a/src/V3Graph.h b/src/V3Graph.h
index a12ce811f..399a93982 100644
--- a/src/V3Graph.h
+++ b/src/V3Graph.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GRAPH_H_
-#define _V3GRAPH_H_ 1
+#ifndef VERILATOR_V3GRAPH_H_
+#define VERILATOR_V3GRAPH_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3GraphAlg.h b/src/V3GraphAlg.h
index f3003f08a..f87936830 100644
--- a/src/V3GraphAlg.h
+++ b/src/V3GraphAlg.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GRAPHALG_H_
-#define _V3GRAPHALG_H_ 1
+#ifndef VERILATOR_V3GRAPHALG_H_
+#define VERILATOR_V3GRAPHALG_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3GraphDfa.h b/src/V3GraphDfa.h
index 26f31ef01..1a102bf47 100644
--- a/src/V3GraphDfa.h
+++ b/src/V3GraphDfa.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GRAPHDFA_H_
-#define _V3GRAPHDFA_H_ 1
+#ifndef VERILATOR_V3GRAPHDFA_H_
+#define VERILATOR_V3GRAPHDFA_H_
 #include "config_build.h"
 #include "verilatedos.h"
 
diff --git a/src/V3GraphPathChecker.h b/src/V3GraphPathChecker.h
index b239a1bca..16eda4764 100644
--- a/src/V3GraphPathChecker.h
+++ b/src/V3GraphPathChecker.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GRAPHPATHCHECKER_H_
-#define _V3GRAPHPATHCHECKER_H_
+#ifndef VERILATOR_V3GRAPHPATHCHECKER_H_
+#define VERILATOR_V3GRAPHPATHCHECKER_H_
 
 #include "V3Error.h"
 #include "V3Graph.h"
diff --git a/src/V3GraphStream.h b/src/V3GraphStream.h
index b58ea458a..84c6c3eec 100644
--- a/src/V3GraphStream.h
+++ b/src/V3GraphStream.h
@@ -15,8 +15,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3GRAPHSTREAM_H_
-#define _V3GRAPHSTREAM_H_
+#ifndef VERILATOR_V3GRAPHSTREAM_H_
+#define VERILATOR_V3GRAPHSTREAM_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Hashed.h b/src/V3Hashed.h
index bad5c246c..9ee62f099 100644
--- a/src/V3Hashed.h
+++ b/src/V3Hashed.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3HASHED_H_
-#define _V3HASHED_H_ 1
+#ifndef VERILATOR_V3HASHED_H_
+#define VERILATOR_V3HASHED_H_
 #include "config_build.h"
 #include "verilatedos.h"
 
diff --git a/src/V3HierBlock.h b/src/V3HierBlock.h
index e3dda62ae..7a7044b25 100644
--- a/src/V3HierBlock.h
+++ b/src/V3HierBlock.h
@@ -18,8 +18,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3HIERBLOCK_H_
-#define _V3HIERBLOCK_H_ 1
+#ifndef VERILATOR_V3HIERBLOCK_H_
+#define VERILATOR_V3HIERBLOCK_H_
 
 #include "verilatedos.h"
 
diff --git a/src/V3Inline.h b/src/V3Inline.h
index 44bbfc327..495870bc0 100644
--- a/src/V3Inline.h
+++ b/src/V3Inline.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3INLINE_H_
-#define _V3INLINE_H_ 1
+#ifndef VERILATOR_V3INLINE_H_
+#define VERILATOR_V3INLINE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Inst.h b/src/V3Inst.h
index 3b7c4c333..1b49a9dd0 100644
--- a/src/V3Inst.h
+++ b/src/V3Inst.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3INST_H_
-#define _V3INST_H_ 1
+#ifndef VERILATOR_V3INST_H_
+#define VERILATOR_V3INST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3InstrCount.h b/src/V3InstrCount.h
index fa7c53086..b344b33b4 100644
--- a/src/V3InstrCount.h
+++ b/src/V3InstrCount.h
@@ -15,8 +15,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3INSTRCOUNT_H_
-#define _V3INSTRCOUNT_H_ 1
+#ifndef VERILATOR_V3INSTRCOUNT_H_
+#define VERILATOR_V3INSTRCOUNT_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LangCode.h b/src/V3LangCode.h
index ccb996836..afad9f30c 100644
--- a/src/V3LangCode.h
+++ b/src/V3LangCode.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LANGCODE_H_
-#define _V3LANGCODE_H_ 1
+#ifndef VERILATOR_V3LANGCODE_H_
+#define VERILATOR_V3LANGCODE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LanguageWords.h b/src/V3LanguageWords.h
index f9c3c92a1..dfcd6f83f 100644
--- a/src/V3LanguageWords.h
+++ b/src/V3LanguageWords.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LANGUAGEWORDS_H_
-#define _V3LANGUAGEWORDS_H_ 1
+#ifndef VERILATOR_V3LANGUAGEWORDS_H_
+#define VERILATOR_V3LANGUAGEWORDS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Life.h b/src/V3Life.h
index 5328503ed..b783ee665 100644
--- a/src/V3Life.h
+++ b/src/V3Life.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LIFE_H_
-#define _V3LIFE_H_ 1
+#ifndef VERILATOR_V3LIFE_H_
+#define VERILATOR_V3LIFE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LifePost.h b/src/V3LifePost.h
index 990f155ac..f36b64c0e 100644
--- a/src/V3LifePost.h
+++ b/src/V3LifePost.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LIFEPOST_H_
-#define _V3LIFEPOST_H_ 1
+#ifndef VERILATOR_V3LIFEPOST_H_
+#define VERILATOR_V3LIFEPOST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkCells.h b/src/V3LinkCells.h
index 7999147c8..a2c8d5cc1 100644
--- a/src/V3LinkCells.h
+++ b/src/V3LinkCells.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKCELLS_H_
-#define _V3LINKCELLS_H_ 1
+#ifndef VERILATOR_V3LINKCELLS_H_
+#define VERILATOR_V3LINKCELLS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkDot.h b/src/V3LinkDot.h
index cfeaf100d..6b650384a 100644
--- a/src/V3LinkDot.h
+++ b/src/V3LinkDot.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKDOT_H_
-#define _V3LINKDOT_H_ 1
+#ifndef VERILATOR_V3LINKDOT_H_
+#define VERILATOR_V3LINKDOT_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkInc.h b/src/V3LinkInc.h
index 051babbba..5fc9f41a1 100644
--- a/src/V3LinkInc.h
+++ b/src/V3LinkInc.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKINC_H_
-#define _V3LINKINC_H_ 1
+#ifndef VERILATOR_V3LINKINC_H_
+#define VERILATOR_V3LINKINC_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkJump.h b/src/V3LinkJump.h
index 36a5d3742..c64a68f76 100644
--- a/src/V3LinkJump.h
+++ b/src/V3LinkJump.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKJUMP_H_
-#define _V3LINKJUMP_H_ 1
+#ifndef VERILATOR_V3LINKJUMP_H_
+#define VERILATOR_V3LINKJUMP_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkLValue.h b/src/V3LinkLValue.h
index 8c0327bd5..41e43e428 100644
--- a/src/V3LinkLValue.h
+++ b/src/V3LinkLValue.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKLVALUE_H_
-#define _V3LINKLVALUE_H_ 1
+#ifndef VERILATOR_V3LINKLVALUE_H_
+#define VERILATOR_V3LINKLVALUE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkLevel.h b/src/V3LinkLevel.h
index e141d0351..4f52f7a60 100644
--- a/src/V3LinkLevel.h
+++ b/src/V3LinkLevel.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKLEVEL_H_
-#define _V3LINKLEVEL_H_ 1
+#ifndef VERILATOR_V3LINKLEVEL_H_
+#define VERILATOR_V3LINKLEVEL_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkParse.h b/src/V3LinkParse.h
index 0abf4e798..1d68d3d3e 100644
--- a/src/V3LinkParse.h
+++ b/src/V3LinkParse.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKPARSE_H_
-#define _V3LINKPARSE_H_ 1
+#ifndef VERILATOR_V3LINKPARSE_H_
+#define VERILATOR_V3LINKPARSE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3LinkResolve.h b/src/V3LinkResolve.h
index 92e351df1..1e9c36bb4 100644
--- a/src/V3LinkResolve.h
+++ b/src/V3LinkResolve.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LINKRESOLVE_H_
-#define _V3LINKRESOLVE_H_ 1
+#ifndef VERILATOR_V3LINKRESOLVE_H_
+#define VERILATOR_V3LINKRESOLVE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3List.h b/src/V3List.h
index 99090bc9e..62f89c942 100644
--- a/src/V3List.h
+++ b/src/V3List.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LIST_H_
-#define _V3LIST_H_ 1
+#ifndef VERILATOR_V3LIST_H_
+#define VERILATOR_V3LIST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Localize.h b/src/V3Localize.h
index 9132145ce..c488a133d 100644
--- a/src/V3Localize.h
+++ b/src/V3Localize.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3LOCALIZE_H_
-#define _V3LOCALIZE_H_ 1
+#ifndef VERILATOR_V3LOCALIZE_H_
+#define VERILATOR_V3LOCALIZE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3MergeCond.h b/src/V3MergeCond.h
index 47c88918d..4a3e9b29d 100644
--- a/src/V3MergeCond.h
+++ b/src/V3MergeCond.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3MERGECOND_H_
-#define _V3MERGECOND_H_ 1
+#ifndef VERILATOR_V3MERGECOND_H_
+#define VERILATOR_V3MERGECOND_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Name.h b/src/V3Name.h
index 2c759178e..cc0d6b069 100644
--- a/src/V3Name.h
+++ b/src/V3Name.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3NAME_H_
-#define _V3NAME_H_ 1
+#ifndef VERILATOR_V3NAME_H_
+#define VERILATOR_V3NAME_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Number.h b/src/V3Number.h
index c2fef325b..92693fcd8 100644
--- a/src/V3Number.h
+++ b/src/V3Number.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3NUMBER_H_
-#define _V3NUMBER_H_ 1
+#ifndef VERILATOR_V3NUMBER_H_
+#define VERILATOR_V3NUMBER_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Options.h b/src/V3Options.h
index 85d372a87..f589fce84 100644
--- a/src/V3Options.h
+++ b/src/V3Options.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3OPTIONS_H_
-#define _V3OPTIONS_H_ 1
+#ifndef VERILATOR_V3OPTIONS_H_
+#define VERILATOR_V3OPTIONS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Order.h b/src/V3Order.h
index 1d55815aa..13e762c14 100644
--- a/src/V3Order.h
+++ b/src/V3Order.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3ORDER_H_
-#define _V3ORDER_H_ 1
+#ifndef VERILATOR_V3ORDER_H_
+#define VERILATOR_V3ORDER_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3OrderGraph.h b/src/V3OrderGraph.h
index c235b8bb9..69051b511 100644
--- a/src/V3OrderGraph.h
+++ b/src/V3OrderGraph.h
@@ -34,8 +34,8 @@
 //          OrderPreCutEdge
 //*************************************************************************
 
-#ifndef _V3ORDERGRAPH_H_
-#define _V3ORDERGRAPH_H_
+#ifndef VERILATOR_V3ORDERGRAPH_H_
+#define VERILATOR_V3ORDERGRAPH_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Os.h b/src/V3Os.h
index 6c519f8b2..69c90e887 100644
--- a/src/V3Os.h
+++ b/src/V3Os.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3OS_H_
-#define _V3OS_H_ 1
+#ifndef VERILATOR_V3OS_H_
+#define VERILATOR_V3OS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Param.h b/src/V3Param.h
index a785602fb..abc07216f 100644
--- a/src/V3Param.h
+++ b/src/V3Param.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PARAM_H_
-#define _V3PARAM_H_ 1
+#ifndef VERILATOR_V3PARAM_H_
+#define VERILATOR_V3PARAM_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Parse.h b/src/V3Parse.h
index 5fe39055d..f1638cdb1 100644
--- a/src/V3Parse.h
+++ b/src/V3Parse.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PARSE_H_
-#define _V3PARSE_H_ 1
+#ifndef VERILATOR_V3PARSE_H_
+#define VERILATOR_V3PARSE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3ParseImp.h b/src/V3ParseImp.h
index 5b4bf7c48..d556d628e 100644
--- a/src/V3ParseImp.h
+++ b/src/V3ParseImp.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PARSEIMP_H_
-#define _V3PARSEIMP_H_ 1
+#ifndef VERILATOR_V3PARSEIMP_H_
+#define VERILATOR_V3PARSEIMP_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3ParseSym.h b/src/V3ParseSym.h
index 80412379d..8c8361c03 100644
--- a/src/V3ParseSym.h
+++ b/src/V3ParseSym.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PARSESYM_H_
-#define _V3PARSESYM_H_ 1
+#ifndef VERILATOR_V3PARSESYM_H_
+#define VERILATOR_V3PARSESYM_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Partition.h b/src/V3Partition.h
index 32006e89e..3405f1b7f 100644
--- a/src/V3Partition.h
+++ b/src/V3Partition.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PARTITION_H_
-#define _V3PARTITION_H_
+#ifndef VERILATOR_V3PARTITION_H_
+#define VERILATOR_V3PARTITION_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3PartitionGraph.h b/src/V3PartitionGraph.h
index 0585f92f7..d824950ce 100644
--- a/src/V3PartitionGraph.h
+++ b/src/V3PartitionGraph.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PARTITIONGRAPH_H_
-#define _V3PARTITIONGRAPH_H_
+#ifndef VERILATOR_V3PARTITIONGRAPH_H_
+#define VERILATOR_V3PARTITIONGRAPH_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3PreLex.h b/src/V3PreLex.h
index c72ea0592..b5b239a6a 100644
--- a/src/V3PreLex.h
+++ b/src/V3PreLex.h
@@ -18,8 +18,8 @@
 // It is not intended for user applications.
 //*************************************************************************
 
-#ifndef _VPRELEX_H_  // Guard
-#define _VPRELEX_H_ 1
+#ifndef VERILATOR_VPRELEX_H_  // Guard
+#define VERILATOR_VPRELEX_H_
 
 #include "V3Error.h"
 #include "V3FileLine.h"
diff --git a/src/V3PreProc.h b/src/V3PreProc.h
index 43d8f3a19..fe96464d9 100644
--- a/src/V3PreProc.h
+++ b/src/V3PreProc.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PREPROC_H_
-#define _V3PREPROC_H_ 1
+#ifndef VERILATOR_V3PREPROC_H_
+#define VERILATOR_V3PREPROC_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3PreShell.h b/src/V3PreShell.h
index b0f9986aa..97198899d 100644
--- a/src/V3PreShell.h
+++ b/src/V3PreShell.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PRESHELL_H_
-#define _V3PRESHELL_H_ 1
+#ifndef VERILATOR_V3PRESHELL_H_
+#define VERILATOR_V3PRESHELL_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Premit.h b/src/V3Premit.h
index d2ea432dd..cfeb48fe2 100644
--- a/src/V3Premit.h
+++ b/src/V3Premit.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PREMIT_H_
-#define _V3PREMIT_H_ 1
+#ifndef VERILATOR_V3PREMIT_H_
+#define VERILATOR_V3PREMIT_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3ProtectLib.h b/src/V3ProtectLib.h
index 39131d307..7f2028141 100644
--- a/src/V3ProtectLib.h
+++ b/src/V3ProtectLib.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3PROTECTLIB_H_
-#define _V3PROTECTLIB_H_ 1
+#ifndef VERILATOR_V3PROTECTLIB_H_
+#define VERILATOR_V3PROTECTLIB_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Randomize.h b/src/V3Randomize.h
index 53c74b182..9cb4df8de 100644
--- a/src/V3Randomize.h
+++ b/src/V3Randomize.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3RANDOMIZE_METHOD_H_
-#define _V3RANDOMIZE_METHOD_H_ 1
+#ifndef VERILATOR_V3RANDOMIZE_METHOD_H_
+#define VERILATOR_V3RANDOMIZE_METHOD_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Reloop.h b/src/V3Reloop.h
index 64c17e50a..4a3302adb 100644
--- a/src/V3Reloop.h
+++ b/src/V3Reloop.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3RELOOP_H_
-#define _V3RELOOP_H_ 1
+#ifndef VERILATOR_V3RELOOP_H_
+#define VERILATOR_V3RELOOP_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Scope.h b/src/V3Scope.h
index 9589aa1e8..ef754c534 100644
--- a/src/V3Scope.h
+++ b/src/V3Scope.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SCOPE_H_
-#define _V3SCOPE_H_ 1
+#ifndef VERILATOR_V3SCOPE_H_
+#define VERILATOR_V3SCOPE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Scoreboard.h b/src/V3Scoreboard.h
index 44297978e..f0370f59d 100644
--- a/src/V3Scoreboard.h
+++ b/src/V3Scoreboard.h
@@ -21,8 +21,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SCOREBOARD_H_
-#define _V3SCOREBOARD_H_
+#ifndef VERILATOR_V3SCOREBOARD_H_
+#define VERILATOR_V3SCOREBOARD_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3SenTree.h b/src/V3SenTree.h
index 22f212707..a04d68b2f 100644
--- a/src/V3SenTree.h
+++ b/src/V3SenTree.h
@@ -16,8 +16,8 @@
 // AstSenTree related utilities.
 //*************************************************************************
 
-#ifndef _V3SENTREE_H_
-#define _V3SENTREE_H_
+#ifndef VERILATOR_V3SENTREE_H_
+#define VERILATOR_V3SENTREE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Simulate.h b/src/V3Simulate.h
index de00d6cb5..0112b8673 100644
--- a/src/V3Simulate.h
+++ b/src/V3Simulate.h
@@ -29,8 +29,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SIMULATE_H_
-#define _V3SIMULATE_H_ 1
+#ifndef VERILATOR_V3SIMULATE_H_
+#define VERILATOR_V3SIMULATE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Slice.h b/src/V3Slice.h
index 40c94c04d..cbc544ad3 100644
--- a/src/V3Slice.h
+++ b/src/V3Slice.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SLICE_H_
-#define _V3SLICE_H_ 1
+#ifndef VERILATOR_V3SLICE_H_
+#define VERILATOR_V3SLICE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Split.h b/src/V3Split.h
index 9bf7ab68d..1fd5f5fb0 100644
--- a/src/V3Split.h
+++ b/src/V3Split.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SPLIT_H_
-#define _V3SPLIT_H_ 1
+#ifndef VERILATOR_V3SPLIT_H_
+#define VERILATOR_V3SPLIT_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3SplitAs.h b/src/V3SplitAs.h
index 3c2886c3b..a0004c4e0 100644
--- a/src/V3SplitAs.h
+++ b/src/V3SplitAs.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SPLITAS_H_
-#define _V3SPLITAS_H_ 1
+#ifndef VERILATOR_V3SPLITAS_H_
+#define VERILATOR_V3SPLITAS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3SplitVar.h b/src/V3SplitVar.h
index 243120195..b952f8f5a 100644
--- a/src/V3SplitVar.h
+++ b/src/V3SplitVar.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SPLITVAR_H_
-#define _V3SPLITVAR_H_ 1
+#ifndef VERILATOR_V3SPLITVAR_H_
+#define VERILATOR_V3SPLITVAR_H_
 
 //============================================================================
 
diff --git a/src/V3Stats.h b/src/V3Stats.h
index 9cebbd057..1b6c785c7 100644
--- a/src/V3Stats.h
+++ b/src/V3Stats.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3STATS_H_
-#define _V3STATS_H_ 1
+#ifndef VERILATOR_V3STATS_H_
+#define VERILATOR_V3STATS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3String.h b/src/V3String.h
index 71d811ec0..54d35a36d 100644
--- a/src/V3String.h
+++ b/src/V3String.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3STRING_H_
-#define _V3STRING_H_ 1
+#ifndef VERILATOR_V3STRING_H_
+#define VERILATOR_V3STRING_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Subst.h b/src/V3Subst.h
index a2dd17202..a4a8a8b91 100644
--- a/src/V3Subst.h
+++ b/src/V3Subst.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SUBST_H_
-#define _V3SUBST_H_ 1
+#ifndef VERILATOR_V3SUBST_H_
+#define VERILATOR_V3SUBST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3SymTable.h b/src/V3SymTable.h
index e1e11151a..304a2f882 100644
--- a/src/V3SymTable.h
+++ b/src/V3SymTable.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3SYMTABLE_H_
-#define _V3SYMTABLE_H_ 1
+#ifndef VERILATOR_V3SYMTABLE_H_
+#define VERILATOR_V3SYMTABLE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3TSP.h b/src/V3TSP.h
index ec81061ea..cb81103f7 100644
--- a/src/V3TSP.h
+++ b/src/V3TSP.h
@@ -15,8 +15,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3TSP_H_
-#define _V3TSP_H_ 1
+#ifndef VERILATOR_V3TSP_H_
+#define VERILATOR_V3TSP_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Table.h b/src/V3Table.h
index 471bc7f05..a5574294a 100644
--- a/src/V3Table.h
+++ b/src/V3Table.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3TABLE_H_
-#define _V3TABLE_H_ 1
+#ifndef VERILATOR_V3TABLE_H_
+#define VERILATOR_V3TABLE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Task.h b/src/V3Task.h
index 9491d62fc..03de4ea32 100644
--- a/src/V3Task.h
+++ b/src/V3Task.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3TASK_H_
-#define _V3TASK_H_ 1
+#ifndef VERILATOR_V3TASK_H_
+#define VERILATOR_V3TASK_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Trace.h b/src/V3Trace.h
index 95691031b..209ea7582 100644
--- a/src/V3Trace.h
+++ b/src/V3Trace.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3TRACE_H_
-#define _V3TRACE_H_ 1
+#ifndef VERILATOR_V3TRACE_H_
+#define VERILATOR_V3TRACE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3TraceDecl.h b/src/V3TraceDecl.h
index 2c0ec73eb..f60f05f9a 100644
--- a/src/V3TraceDecl.h
+++ b/src/V3TraceDecl.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3TRACEDECL_H_
-#define _V3TRACEDECL_H_ 1
+#ifndef VERILATOR_V3TRACEDECL_H_
+#define VERILATOR_V3TRACEDECL_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Tristate.h b/src/V3Tristate.h
index 079c44a27..ffbe63602 100644
--- a/src/V3Tristate.h
+++ b/src/V3Tristate.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3TRISTATE_H_
-#define _V3TRISTATE_H_ 1
+#ifndef VERILATOR_V3TRISTATE_H_
+#define VERILATOR_V3TRISTATE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Undriven.h b/src/V3Undriven.h
index 52d4361ce..98ddc041b 100644
--- a/src/V3Undriven.h
+++ b/src/V3Undriven.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3UNDRIVEN_H_
-#define _V3UNDRIVEN_H_ 1
+#ifndef VERILATOR_V3UNDRIVEN_H_
+#define VERILATOR_V3UNDRIVEN_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Unknown.h b/src/V3Unknown.h
index b203c7720..0ad1a942c 100644
--- a/src/V3Unknown.h
+++ b/src/V3Unknown.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3UNKNOWN_H_
-#define _V3UNKNOWN_H_ 1
+#ifndef VERILATOR_V3UNKNOWN_H_
+#define VERILATOR_V3UNKNOWN_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Unroll.h b/src/V3Unroll.h
index e38658d97..710c292f4 100644
--- a/src/V3Unroll.h
+++ b/src/V3Unroll.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3UNROLL_H_
-#define _V3UNROLL_H_ 1
+#ifndef VERILATOR_V3UNROLL_H_
+#define VERILATOR_V3UNROLL_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3Waiver.h b/src/V3Waiver.h
index 165ae1f9f..8be22fbec 100644
--- a/src/V3Waiver.h
+++ b/src/V3Waiver.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3WAIVER_H_
-#define _V3WAIVER_H_ 1
+#ifndef VERILATOR_V3WAIVER_H_
+#define VERILATOR_V3WAIVER_H_
 
 #include "V3Error.h"
 
diff --git a/src/V3Width.cpp b/src/V3Width.cpp
index f9a8fbe6c..1c5bbdfc2 100644
--- a/src/V3Width.cpp
+++ b/src/V3Width.cpp
@@ -77,7 +77,7 @@
 #include <algorithm>
 
 // More code; this file was getting too large; see actions there
-#define _V3WIDTH_CPP_
+#define VERILATOR_V3WIDTH_CPP_
 #include "V3WidthCommit.h"
 
 //######################################################################
diff --git a/src/V3Width.h b/src/V3Width.h
index db2d0cccc..6b7f1d5ca 100644
--- a/src/V3Width.h
+++ b/src/V3Width.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3WIDTH_H_
-#define _V3WIDTH_H_ 1
+#ifndef VERILATOR_V3WIDTH_H_
+#define VERILATOR_V3WIDTH_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/V3WidthCommit.h b/src/V3WidthCommit.h
index 7ffb9fb8d..1892ac2d0 100644
--- a/src/V3WidthCommit.h
+++ b/src/V3WidthCommit.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _V3WIDTHCOMMIT_H_
-#define _V3WIDTHCOMMIT_H_ 1
+#ifndef VERILATOR_V3WIDTHCOMMIT_H_
+#define VERILATOR_V3WIDTHCOMMIT_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
@@ -24,7 +24,7 @@
 #include "V3Ast.h"
 
 // clang-format off
-#ifndef _V3WIDTH_CPP_
+#ifndef VERILATOR_V3WIDTH_CPP_
 # error "V3WidthCommit for V3Width internal use only"
 #endif
 // clang-format on
diff --git a/src/VlcBucket.h b/src/VlcBucket.h
index b59f1d6c2..e68483af2 100644
--- a/src/VlcBucket.h
+++ b/src/VlcBucket.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _VLCBUCKET_H_
-#define _VLCBUCKET_H_ 1
+#ifndef VERILATOR_VLCBUCKET_H_
+#define VERILATOR_VLCBUCKET_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/VlcOptions.h b/src/VlcOptions.h
index fc999c7fb..29b88f1e1 100644
--- a/src/VlcOptions.h
+++ b/src/VlcOptions.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _VLCOPTIONS_H_
-#define _VLCOPTIONS_H_ 1
+#ifndef VERILATOR_VLCOPTIONS_H_
+#define VERILATOR_VLCOPTIONS_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/VlcPoint.h b/src/VlcPoint.h
index e8b11d197..f05dfecb2 100644
--- a/src/VlcPoint.h
+++ b/src/VlcPoint.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _VLCPOINT_H_
-#define _VLCPOINT_H_ 1
+#ifndef VERILATOR_VLCPOINT_H_
+#define VERILATOR_VLCPOINT_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/VlcSource.h b/src/VlcSource.h
index 18abda529..7cb274f35 100644
--- a/src/VlcSource.h
+++ b/src/VlcSource.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _VLCSOURCE_H_
-#define _VLCSOURCE_H_ 1
+#ifndef VERILATOR_VLCSOURCE_H_
+#define VERILATOR_VLCSOURCE_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/VlcTest.h b/src/VlcTest.h
index 71d8a8f52..e2aa8adc0 100644
--- a/src/VlcTest.h
+++ b/src/VlcTest.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _VLCTEST_H_
-#define _VLCTEST_H_ 1
+#ifndef VERILATOR_VLCTEST_H_
+#define VERILATOR_VLCTEST_H_
 
 #include "config_build.h"
 #include "verilatedos.h"
diff --git a/src/VlcTop.h b/src/VlcTop.h
index 28c6ce972..106191b1a 100644
--- a/src/VlcTop.h
+++ b/src/VlcTop.h
@@ -14,8 +14,8 @@
 //
 //*************************************************************************
 
-#ifndef _VLCTOP_H_
-#define _VLCTOP_H_ 1
+#ifndef VERILATOR_VLCTOP_H_
+#define VERILATOR_VLCTOP_H_
 
 #include "config_build.h"
 #include "verilatedos.h"