diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp
index bc8ce6eb0..698b40e24 100644
--- a/include/verilated_vcd_c.cpp
+++ b/include/verilated_vcd_c.cpp
@@ -906,7 +906,7 @@ void vcdInit(void*, VerilatedVcd* vcdp, vluint32_t) {
     /**/  // Note need to add 2 for next code.
     /**/ vcdp->declFloat(0x1e, "flo", -1, 0);
     /**/ vcdp->declArray(0x20, "q2", -1, 0, 95, 0);
-    /**/ // Note need to add 4 for next code.
+    /**/  // Note need to add 4 for next code.
 }
 
 void vcdFull(void*, VerilatedVcd* vcdp) {
diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index dbd8e8779..3ea28e9f2 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -1145,7 +1145,7 @@ void AstNode::dumpTreeFile(const string& filename, bool append, bool doDump) {
 
 void AstNode::v3errorEndFatal(std::ostringstream& str) const {
     v3errorEnd(str);
-    assert(0);
+    assert(0);  // LCOV_EXCL_LINE
     VL_UNREACHABLE
 }
 
diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp
index d8afe8742..777b9cf0a 100644
--- a/src/V3Broken.cpp
+++ b/src/V3Broken.cpp
@@ -150,11 +150,12 @@ public:
     static void prepForTree() {
 #ifndef VL_LEAK_CHECKS
         s_nodes.clear();
-#endif
+#else
         for (NodeMap::iterator it = s_nodes.begin(); it != s_nodes.end(); ++it) {
             it->second &= ~FLAG_IN_TREE;
             it->second &= ~FLAG_LINKABLE;
         }
+#endif
     }
     static void doneWithTree() {
         for (int backs = 0; backs < 2;
diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index da56681cf..985e08c92 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -2913,9 +2913,6 @@ void EmitCImp::emitIntTop(AstNodeModule* modp) {
         puts("#include \"verilated_cov.h\"\n");
         if (v3Global.opt.savable()) v3error("--coverage and --savable not supported together");
     }
-    if (v3Global.needHInlines()) {  // Set by V3EmitCInlines; should have been called before us
-        puts("#include \"" + topClassName() + "__Inlines.h\"\n");
-    }
     if (v3Global.dpi()) {
         // do this before including our main .h file so that any references to
         // types defined in svdpi.h are available
diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp
index 6da034853..21ad39106 100644
--- a/src/V3EmitCInlines.cpp
+++ b/src/V3EmitCInlines.cpp
@@ -33,7 +33,6 @@ class EmitCInlines : EmitCBaseVisitor {
     // STATE
 
     // METHODS
-    void emitInt();
 
     // VISITORS
     virtual void visit(AstBasicDType* nodep) VL_OVERRIDE {
@@ -113,32 +112,9 @@ class EmitCInlines : EmitCBaseVisitor {
     virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); }
 
 public:
-    explicit EmitCInlines(AstNetlist* nodep) {
-        iterate(nodep);
-        if (v3Global.needHInlines()) emitInt();
-    }
+    explicit EmitCInlines(AstNetlist* nodep) { iterate(nodep); }
 };
 
-void EmitCInlines::emitInt() {
-    string filename = v3Global.opt.makeDir() + "/" + topClassName() + "__Inlines.h";
-    newCFile(filename, false /*slow*/, false /*source*/);
-    V3OutCFile hf(filename);
-    m_ofp = &hf;
-
-    ofp()->putsHeader();
-    ofp()->putsGuard();
-    puts("\n");
-
-    puts("#include \"verilated.h\"\n");
-
-    puts("\n//======================\n\n");
-
-    // Placeholder - v3Global.needHInlines(true) currently not used
-
-    puts("//======================\n\n");
-    ofp()->putsEndGuard();
-}
-
 //######################################################################
 // EmitC class functions
 
diff --git a/src/V3Error.h b/src/V3Error.h
index db32d6e04..87d2afd7a 100644
--- a/src/V3Error.h
+++ b/src/V3Error.h
@@ -298,7 +298,7 @@ inline int debug() { return V3Error::debugDefault(); }
 inline void v3errorEnd(std::ostringstream& sstr) { V3Error::v3errorEnd(sstr); }
 inline void v3errorEndFatal(std::ostringstream& sstr) {
     V3Error::v3errorEnd(sstr);
-    assert(0);
+    assert(0);  // LCOV_EXCL_LINE
     VL_UNREACHABLE
 }
 
diff --git a/src/V3FileLine.h b/src/V3FileLine.h
index d5d1833cd..1a68a807d 100644
--- a/src/V3FileLine.h
+++ b/src/V3FileLine.h
@@ -271,7 +271,7 @@ std::ostream& operator<<(std::ostream& os, FileLine* fileline);
 
 inline void FileLine::v3errorEndFatal(std::ostringstream& str) {
     v3errorEnd(str);
-    assert(0);
+    assert(0);  // LCOV_EXCL_LINE
     VL_UNREACHABLE
 }
 
diff --git a/src/V3Global.h b/src/V3Global.h
index 07bc52e7b..49ccd2363 100644
--- a/src/V3Global.h
+++ b/src/V3Global.h
@@ -74,7 +74,6 @@ class V3Global {
     bool m_assertDTypesResolved;  // Tree should have dtypep()'s
     bool m_constRemoveXs;  // Const needs to strip any Xs
     bool m_needC11;  // Need C++11
-    bool m_needHInlines;  // Need __Inlines file
     bool m_needHeavy;  // Need verilated_heavy.h include
     bool m_needTraceDumper;  // Need __Vm_dumperp in symbols
     bool m_dpi;  // Need __Dpi include files
@@ -92,7 +91,6 @@ public:
         , m_assertDTypesResolved(false)
         , m_constRemoveXs(false)
         , m_needC11(false)
-        , m_needHInlines(false)
         , m_needHeavy(false)
         , m_needTraceDumper(false)
         , m_dpi(false) {}
@@ -125,8 +123,6 @@ public:
     }
     bool needC11() const { return m_needC11; }
     void needC11(bool flag) { m_needC11 = flag; }
-    bool needHInlines() const { return m_needHInlines; }
-    void needHInlines(bool flag) { m_needHInlines = flag; }
     bool needHeavy() const { return m_needHeavy; }
     void needHeavy(bool flag) { m_needHeavy = flag; }
     bool needTraceDumper() const { return m_needTraceDumper; }
diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp
index fc2cc08f5..a9c35e8ce 100644
--- a/src/V3Graph.cpp
+++ b/src/V3Graph.cpp
@@ -142,7 +142,7 @@ void V3GraphVertex::v3errorEnd(std::ostringstream& str) const {
 }
 void V3GraphVertex::v3errorEndFatal(std::ostringstream& str) const {
     v3errorEnd(str);
-    assert(0);
+    assert(0);  // LCOV_EXCL_LINE
     VL_UNREACHABLE
 }
 
diff --git a/src/V3Number.cpp b/src/V3Number.cpp
index d149a510f..d3491bcd2 100644
--- a/src/V3Number.cpp
+++ b/src/V3Number.cpp
@@ -85,7 +85,7 @@ void V3Number::v3errorEnd(std::ostringstream& str) const {
 
 void V3Number::v3errorEndFatal(std::ostringstream& str) const {
     v3errorEnd(str);
-    assert(0);
+    assert(0);  // LCOV_EXCL_LINE
     VL_UNREACHABLE
 }