diff --git a/include/verilated.cpp b/include/verilated.cpp
index 11345c229..49d06ac6e 100644
--- a/include/verilated.cpp
+++ b/include/verilated.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2003-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated.h b/include/verilated.h
index 1af8d13c0..34e8f6701 100644
--- a/include/verilated.h
+++ b/include/verilated.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2003-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated.v b/include/verilated.v
index b7869ec65..74b1c8cc2 100644
--- a/include/verilated.v
+++ b/include/verilated.v
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //*************************************************************************
 //
 // Code available from: http://www.veripool.org/verilator
diff --git a/include/verilated_dpi.cpp b/include/verilated_dpi.cpp
index 25c124e5a..c59c6cb82 100644
--- a/include/verilated_dpi.cpp
+++ b/include/verilated_dpi.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated_dpi.h b/include/verilated_dpi.h
index 686457aae..63a57480c 100644
--- a/include/verilated_dpi.h
+++ b/include/verilated_dpi.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2003-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated_heavy.h b/include/verilated_heavy.h
index 83de5f086..d00eb2ac1 100644
--- a/include/verilated_heavy.h
+++ b/include/verilated_heavy.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2010-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated_imp.h b/include/verilated_imp.h
index 2161bd43f..764371ad3 100644
--- a/include/verilated_imp.h
+++ b/include/verilated_imp.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated_sc.h b/include/verilated_sc.h
index ea152c4d6..5ed69817f 100644
--- a/include/verilated_sc.h
+++ b/include/verilated_sc.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated_syms.h b/include/verilated_syms.h
index dabe5686e..ab78653bd 100644
--- a/include/verilated_syms.h
+++ b/include/verilated_syms.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2003-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp
index 234f15f87..efc8ddedb 100644
--- a/include/verilated_vcd_c.cpp
+++ b/include/verilated_vcd_c.cpp
@@ -1,4 +1,4 @@
-// -*- SystemC -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //=============================================================================
 //
 // THIS MODULE IS PUBLICLY LICENSED
diff --git a/include/verilated_vcd_c.h b/include/verilated_vcd_c.h
index 8cea29843..98048e993 100644
--- a/include/verilated_vcd_c.h
+++ b/include/verilated_vcd_c.h
@@ -1,4 +1,4 @@
-// -*- SystemC -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //=============================================================================
 //
 // THIS MODULE IS PUBLICLY LICENSED
diff --git a/include/verilated_vcd_sc.cpp b/include/verilated_vcd_sc.cpp
index 578da79f4..c45ae8120 100644
--- a/include/verilated_vcd_sc.cpp
+++ b/include/verilated_vcd_sc.cpp
@@ -1,4 +1,4 @@
-// -*- SystemC -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //=============================================================================
 //
 // THIS MODULE IS PUBLICLY LICENSED
diff --git a/include/verilated_vcd_sc.h b/include/verilated_vcd_sc.h
index a68252ed9..10237378c 100644
--- a/include/verilated_vcd_sc.h
+++ b/include/verilated_vcd_sc.h
@@ -1,4 +1,4 @@
-// -*- SystemC -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //=============================================================================
 //
 // THIS MODULE IS PUBLICLY LICENSED
diff --git a/include/verilated_vpi.cpp b/include/verilated_vpi.cpp
index a81f2aeb6..f97011e7e 100644
--- a/include/verilated_vpi.cpp
+++ b/include/verilated_vpi.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilated_vpi.h b/include/verilated_vpi.h
index 0f2b9faf3..620d87485 100644
--- a/include/verilated_vpi.h
+++ b/include/verilated_vpi.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2012 by Wilson Snyder. This program is free software; you can
diff --git a/include/verilatedos.h b/include/verilatedos.h
index 856b85e93..00c140932 100644
--- a/include/verilatedos.h
+++ b/include/verilatedos.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2003-2012 by Wilson Snyder. This program is free software; you can
diff --git a/src/V3Active.cpp b/src/V3Active.cpp
index b9bcadefc..d9004ea0f 100644
--- a/src/V3Active.cpp
+++ b/src/V3Active.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity active domains
 //
diff --git a/src/V3Active.h b/src/V3Active.h
index 0791bd412..9b03b8f9d 100644
--- a/src/V3Active.h
+++ b/src/V3Active.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity block domains
 //
diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp
index 9acb3b4de..cf0147fc9 100644
--- a/src/V3ActiveTop.cpp
+++ b/src/V3ActiveTop.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity active domains
 //
diff --git a/src/V3ActiveTop.h b/src/V3ActiveTop.h
index 39ab75bfc..2eca60591 100644
--- a/src/V3ActiveTop.h
+++ b/src/V3ActiveTop.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity block domains
 //
diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp
index 3c5433d30..34333848b 100644
--- a/src/V3Assert.cpp
+++ b/src/V3Assert.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Collect and print statistics
 //
diff --git a/src/V3Assert.h b/src/V3Assert.h
index a62022268..777f1d964 100644
--- a/src/V3Assert.h
+++ b/src/V3Assert.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Assertion expansion
 //
diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp
index 35945e5c3..0b997954f 100644
--- a/src/V3AssertPre.cpp
+++ b/src/V3AssertPre.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Collect and print statistics
 //
diff --git a/src/V3AssertPre.h b/src/V3AssertPre.h
index f5d6f3a33..41292182f 100644
--- a/src/V3AssertPre.h
+++ b/src/V3AssertPre.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Assertion pre-expansion
 //
diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index 0285c422c..8d76b763e 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Ast node structures
 //
diff --git a/src/V3Ast.h b/src/V3Ast.h
index 85fa9e538..80bc45de5 100644
--- a/src/V3Ast.h
+++ b/src/V3Ast.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Ast node structure
 //
diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
index 2e8abedf4..72dc9f8b0 100644
--- a/src/V3AstNodes.cpp
+++ b/src/V3AstNodes.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Ast node structures
 //
diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h
index 81f1413b7..0b875bcda 100644
--- a/src/V3AstNodes.h
+++ b/src/V3AstNodes.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Ast node structure
 //
diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp
index daeed9ff8..efe965840 100644
--- a/src/V3Begin.cpp
+++ b/src/V3Begin.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Removal of named begin blocks
 //
diff --git a/src/V3Begin.h b/src/V3Begin.h
index 4684ef6a0..833880174 100644
--- a/src/V3Begin.h
+++ b/src/V3Begin.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Removal of named begin blocks
 //
diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp
index c4f8fe714..c7ed6041c 100644
--- a/src/V3Branch.cpp
+++ b/src/V3Branch.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Branch prediction
 //
diff --git a/src/V3Branch.h b/src/V3Branch.h
index a61da114f..d4c2e441e 100644
--- a/src/V3Branch.h
+++ b/src/V3Branch.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Branch prediction
 //
diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp
index 2f560ac76..d501eab2b 100644
--- a/src/V3Broken.cpp
+++ b/src/V3Broken.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Find broken links in tree
 //
diff --git a/src/V3Broken.h b/src/V3Broken.h
index 5a68bdb4e..30b362ac4 100644
--- a/src/V3Broken.h
+++ b/src/V3Broken.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Find broken links in tree
 //
diff --git a/src/V3Case.cpp b/src/V3Case.cpp
index 087a8428a..f529367a7 100644
--- a/src/V3Case.cpp
+++ b/src/V3Case.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break case statements up and add Unknown assigns
 //
diff --git a/src/V3Case.h b/src/V3Case.h
index 39a6c765b..2cf161839 100644
--- a/src/V3Case.h
+++ b/src/V3Case.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break case statements up and add Unknown assigns
 //
diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp
index e6aa583cb..a670a6942 100644
--- a/src/V3Cast.cpp
+++ b/src/V3Cast.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add C++ casts across expression size changes
 //
diff --git a/src/V3Cast.h b/src/V3Cast.h
index 3f71bf062..52cfcdbf7 100644
--- a/src/V3Cast.h
+++ b/src/V3Cast.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add C++ casts across expression size changes
 //
diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp
index 7f228fe3a..c111bcbd2 100644
--- a/src/V3Cdc.cpp
+++ b/src/V3Cdc.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Clock Domain Crossing Lint
 //
diff --git a/src/V3Cdc.h b/src/V3Cdc.h
index b39abafb3..47a59dd81 100644
--- a/src/V3Cdc.h
+++ b/src/V3Cdc.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity block domains
 //
diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp
index 5e941ec5c..ae3581637 100644
--- a/src/V3Changed.cpp
+++ b/src/V3Changed.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for changed nodes
 //
diff --git a/src/V3Changed.h b/src/V3Changed.h
index 283778117..c77bf8c61 100644
--- a/src/V3Changed.h
+++ b/src/V3Changed.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Pre C-Emit stage changes
 //
diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp
index 5123cc4ff..59881ceeb 100644
--- a/src/V3Clean.cpp
+++ b/src/V3Clean.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for clean nodes
 //
diff --git a/src/V3Clean.h b/src/V3Clean.h
index 812edb9ff..5de65e878 100644
--- a/src/V3Clean.h
+++ b/src/V3Clean.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Pre C-Emit stage changes
 //
diff --git a/src/V3ClkGater.cpp b/src/V3ClkGater.cpp
index 031374bef..3881ac8d5 100644
--- a/src/V3ClkGater.cpp
+++ b/src/V3ClkGater.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity active domains
 //
diff --git a/src/V3ClkGater.h b/src/V3ClkGater.h
index 72ad442c6..0eab9f4b3 100644
--- a/src/V3ClkGater.h
+++ b/src/V3ClkGater.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into clock gated blocks
 //
diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp
index 29cd765fe..ff9d512ec 100644
--- a/src/V3Clock.cpp
+++ b/src/V3Clock.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Clocking POS/NEGEDGE insertion
 //
diff --git a/src/V3Clock.h b/src/V3Clock.h
index 6b13334b1..28c3e6308 100644
--- a/src/V3Clock.h
+++ b/src/V3Clock.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Clocking POS/NEGEDGE insertion
 //
diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp
index a4b28196d..1cc0571be 100644
--- a/src/V3Combine.cpp
+++ b/src/V3Combine.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Combine common code into functions
 //
diff --git a/src/V3Combine.h b/src/V3Combine.h
index 398ff2dc5..11d2356c0 100644
--- a/src/V3Combine.h
+++ b/src/V3Combine.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Combine common code into functions
 //
diff --git a/src/V3Config.cpp b/src/V3Config.cpp
index f7295c1a2..32530c447 100644
--- a/src/V3Config.cpp
+++ b/src/V3Config.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Configuration Files
 //
diff --git a/src/V3Config.h b/src/V3Config.h
index ee12e9c9a..c27658949 100644
--- a/src/V3Config.h
+++ b/src/V3Config.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Configuration Files
 //
diff --git a/src/V3Const.cpp b/src/V3Const.cpp
index 1b515f6ab..f8ebbfa91 100644
--- a/src/V3Const.cpp
+++ b/src/V3Const.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Constant folding
 //
diff --git a/src/V3Const.h b/src/V3Const.h
index 9b7e61ace..b7bd4cb4e 100644
--- a/src/V3Const.h
+++ b/src/V3Const.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Propagate constants across AST
 //
diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp
index 8b0e94620..10efcfc30 100644
--- a/src/V3Coverage.cpp
+++ b/src/V3Coverage.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Netlist (top level) functions
 //
diff --git a/src/V3Coverage.h b/src/V3Coverage.h
index c2c21c1e8..9c0dbb4df 100644
--- a/src/V3Coverage.h
+++ b/src/V3Coverage.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Coverage modules/signals together
 //
diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp
index ff33cef84..2aef45450 100644
--- a/src/V3CoverageJoin.cpp
+++ b/src/V3CoverageJoin.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Netlist (top level) functions
 //
diff --git a/src/V3CoverageJoin.h b/src/V3CoverageJoin.h
index d020fee7d..08fc323c8 100644
--- a/src/V3CoverageJoin.h
+++ b/src/V3CoverageJoin.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Coverage modules/signals together
 //
diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp
index 7d75357d8..6d76bbdc0 100644
--- a/src/V3Dead.cpp
+++ b/src/V3Dead.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Dead code elimination
 //
diff --git a/src/V3Dead.h b/src/V3Dead.h
index c7de7bf67..1b57524a1 100644
--- a/src/V3Dead.h
+++ b/src/V3Dead.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Dead branch elimination
 //
diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp
index bc56ba31f..16c1af2ec 100644
--- a/src/V3Delayed.cpp
+++ b/src/V3Delayed.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for delayed nodes
 //
diff --git a/src/V3Delayed.h b/src/V3Delayed.h
index a12cf9b02..c5833f59d 100644
--- a/src/V3Delayed.h
+++ b/src/V3Delayed.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Pre C-Emit stage changes
 //
diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp
index 3eb8e6396..472b912d4 100644
--- a/src/V3Depth.cpp
+++ b/src/V3Depth.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Prevent very deep expressions
 //
diff --git a/src/V3Depth.h b/src/V3Depth.h
index b6204c09a..c147fdd11 100644
--- a/src/V3Depth.h
+++ b/src/V3Depth.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Prevent very deep expressions
 //
diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp
index 583cf93d6..a5db32f2f 100644
--- a/src/V3DepthBlock.cpp
+++ b/src/V3DepthBlock.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Prevent very deep expressions
 //
diff --git a/src/V3DepthBlock.h b/src/V3DepthBlock.h
index 03f19ab0e..d2fa3f12d 100644
--- a/src/V3DepthBlock.h
+++ b/src/V3DepthBlock.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Prevent very deep expressions
 //
diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp
index 89b1cc10b..205f1eaff 100644
--- a/src/V3Descope.cpp
+++ b/src/V3Descope.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Rename scope references to module-local references
 //
diff --git a/src/V3Descope.h b/src/V3Descope.h
index aa27a12cf..cffadb8cc 100644
--- a/src/V3Descope.h
+++ b/src/V3Descope.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Rename scope references to module-local references
 //
diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index 4a68b82b2..84151c316 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit C++ for tree
 //
diff --git a/src/V3EmitC.h b/src/V3EmitC.h
index 0eecb7192..1411cc21d 100644
--- a/src/V3EmitC.h
+++ b/src/V3EmitC.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit C++ code for module tree
 //
diff --git a/src/V3EmitCBase.h b/src/V3EmitCBase.h
index c87228c0b..23ea31698 100644
--- a/src/V3EmitCBase.h
+++ b/src/V3EmitCBase.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit C++ for tree
 //
diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp
index 6ee79aec4..c0b56da44 100644
--- a/src/V3EmitCInlines.cpp
+++ b/src/V3EmitCInlines.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit C++ for tree
 //
diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp
index 002839d1c..748c70c6a 100644
--- a/src/V3EmitCSyms.cpp
+++ b/src/V3EmitCSyms.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit C++ for tree
 //
diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp
index f5d537670..1364cc7b9 100644
--- a/src/V3EmitMk.cpp
+++ b/src/V3EmitMk.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit Makefile
 //
diff --git a/src/V3EmitMk.h b/src/V3EmitMk.h
index 2f1290737..7671fe71d 100644
--- a/src/V3EmitMk.h
+++ b/src/V3EmitMk.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit Makefile
 //
diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp
index fa4d575d3..020abf61c 100644
--- a/src/V3EmitV.cpp
+++ b/src/V3EmitV.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit Verilog from tree
 //
diff --git a/src/V3EmitV.h b/src/V3EmitV.h
index e25fe8e8c..511f85f0f 100644
--- a/src/V3EmitV.h
+++ b/src/V3EmitV.h
@@ -1,4 +1,4 @@
-//-*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit Verilog code for module tree
 //
diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp
index 035923d51..12a5ff69c 100644
--- a/src/V3EmitXml.cpp
+++ b/src/V3EmitXml.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit Verilog from tree
 //
diff --git a/src/V3EmitXml.h b/src/V3EmitXml.h
index 7548d72f8..9d6fd0bf7 100644
--- a/src/V3EmitXml.h
+++ b/src/V3EmitXml.h
@@ -1,4 +1,4 @@
-//-*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Emit XML code
 //
diff --git a/src/V3Error.cpp b/src/V3Error.cpp
index 4d0ad735b..99811483c 100644
--- a/src/V3Error.cpp
+++ b/src/V3Error.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Error handling
 //
diff --git a/src/V3Error.h b/src/V3Error.h
index 8773a9b72..61d614a83 100644
--- a/src/V3Error.h
+++ b/src/V3Error.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Error handling
 //
diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp
index cddd8cf96..487affbc4 100644
--- a/src/V3Expand.cpp
+++ b/src/V3Expand.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for expand nodes
 //
diff --git a/src/V3Expand.h b/src/V3Expand.h
index 124eed5b2..990346572 100644
--- a/src/V3Expand.h
+++ b/src/V3Expand.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Expansion of wide operator macros to C operators
 //
diff --git a/src/V3File.cpp b/src/V3File.cpp
index 632e4b35c..867806839 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: File stream wrapper that understands indentation
 //
diff --git a/src/V3File.h b/src/V3File.h
index 8d646e6d9..48ed89a41 100644
--- a/src/V3File.h
+++ b/src/V3File.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: File stream wrapper that understands indentation
 //
diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp
index 273fea61a..330b11fd0 100644
--- a/src/V3Gate.cpp
+++ b/src/V3Gate.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Gate optimizations, such as wire elimination
 //
diff --git a/src/V3Gate.h b/src/V3Gate.h
index e59129ff3..451a99f12 100644
--- a/src/V3Gate.h
+++ b/src/V3Gate.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity block domains
 //
diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp
index 8d49ecb82..92ac56c97 100644
--- a/src/V3GenClk.cpp
+++ b/src/V3GenClk.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Generated Clock repairs
 //
diff --git a/src/V3GenClk.h b/src/V3GenClk.h
index aaa23541b..294786403 100644
--- a/src/V3GenClk.h
+++ b/src/V3GenClk.h
@@ -1,4 +1,4 @@
-//-*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Generated Clock Repairs
 //
diff --git a/src/V3Global.h b/src/V3Global.h
index b56e451ba..6a3760004 100644
--- a/src/V3Global.h
+++ b/src/V3Global.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Common headers
 //
diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp
index 978ef567c..e2e9b9762 100644
--- a/src/V3Graph.cpp
+++ b/src/V3Graph.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph optimizations
 //
diff --git a/src/V3Graph.h b/src/V3Graph.h
index 92ccd018a..8f1b4bf76 100644
--- a/src/V3Graph.h
+++ b/src/V3Graph.h
@@ -1,4 +1,4 @@
-//-*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph optimizations
 //
diff --git a/src/V3GraphAcyc.cpp b/src/V3GraphAcyc.cpp
index a5022b72d..93832ba57 100644
--- a/src/V3GraphAcyc.cpp
+++ b/src/V3GraphAcyc.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph acyclic algorithm
 //
diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp
index 1e21f63b9..f2903ff81 100644
--- a/src/V3GraphAlg.cpp
+++ b/src/V3GraphAlg.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph optimizations
 //
diff --git a/src/V3GraphAlg.h b/src/V3GraphAlg.h
index 4f5776c58..1cc11eb0c 100644
--- a/src/V3GraphAlg.h
+++ b/src/V3GraphAlg.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph algorithm base class
 //
diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp
index b68b584e8..45cc113c5 100644
--- a/src/V3GraphDfa.cpp
+++ b/src/V3GraphDfa.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph optimizations
 //
diff --git a/src/V3GraphDfa.h b/src/V3GraphDfa.h
index c977b1508..c64a6cec5 100644
--- a/src/V3GraphDfa.h
+++ b/src/V3GraphDfa.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph automata base class
 //
diff --git a/src/V3GraphTest.cpp b/src/V3GraphTest.cpp
index 302771bc0..34394edf0 100644
--- a/src/V3GraphTest.cpp
+++ b/src/V3GraphTest.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Graph tests
 //
diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp
index 79edb503f..c24cd739e 100644
--- a/src/V3Hashed.cpp
+++ b/src/V3Hashed.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Hashed common code into functions
 //
diff --git a/src/V3Hashed.h b/src/V3Hashed.h
index 5118fd6f3..1780f25b1 100644
--- a/src/V3Hashed.h
+++ b/src/V3Hashed.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Hash AST trees to find duplicates
 //
diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp
index 619eb44c2..f5937db9d 100644
--- a/src/V3Inline.cpp
+++ b/src/V3Inline.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for inline nodes
 //
diff --git a/src/V3Inline.h b/src/V3Inline.h
index c5e8c694f..6eba3aa4b 100644
--- a/src/V3Inline.h
+++ b/src/V3Inline.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Inlining of modules
 //
diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp
index 428beb1fb..0e4bd34d1 100644
--- a/src/V3Inst.cpp
+++ b/src/V3Inst.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for inst nodes
 //
diff --git a/src/V3Inst.h b/src/V3Inst.h
index 6c90a6bc3..1c78d5543 100644
--- a/src/V3Inst.h
+++ b/src/V3Inst.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity inst domains
 //
diff --git a/src/V3LanguageWords.h b/src/V3LanguageWords.h
index a51c784ab..02158d345 100644
--- a/src/V3LanguageWords.h
+++ b/src/V3LanguageWords.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Language rules
 //
diff --git a/src/V3Life.cpp b/src/V3Life.cpp
index 6bd764603..7cded6386 100644
--- a/src/V3Life.cpp
+++ b/src/V3Life.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Lifelicate variable assignment elimination
 //
diff --git a/src/V3Life.h b/src/V3Life.h
index 625684c9b..dbeb226a7 100644
--- a/src/V3Life.h
+++ b/src/V3Life.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Variable life analysis
 //
diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp
index 64fe5d646..32d571cfd 100644
--- a/src/V3LifePost.cpp
+++ b/src/V3LifePost.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: AssignPost Variable assignment elimination
 //
diff --git a/src/V3LifePost.h b/src/V3LifePost.h
index 369e33448..173366f71 100644
--- a/src/V3LifePost.h
+++ b/src/V3LifePost.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Lifepost variable analysis
 //
diff --git a/src/V3Link.cpp b/src/V3Link.cpp
index 42c7a2393..21825683a 100644
--- a/src/V3Link.cpp
+++ b/src/V3Link.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Resolve module/signal name references
 //
diff --git a/src/V3Link.h b/src/V3Link.h
index 9a586fb00..b846ed836 100644
--- a/src/V3Link.h
+++ b/src/V3Link.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link modules/signals together
 //
diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp
index a43e5adc7..d86cd579e 100644
--- a/src/V3LinkCells.cpp
+++ b/src/V3LinkCells.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Resolve module/signal name references
 //
diff --git a/src/V3LinkCells.h b/src/V3LinkCells.h
index 6d4f90625..af1029547 100644
--- a/src/V3LinkCells.h
+++ b/src/V3LinkCells.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link modules/signals together
 //
diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp
index 71131e430..c081de8e5 100644
--- a/src/V3LinkDot.cpp
+++ b/src/V3LinkDot.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Resolve module/signal name references
 //
diff --git a/src/V3LinkDot.h b/src/V3LinkDot.h
index ec108f30a..cbbb21f94 100644
--- a/src/V3LinkDot.h
+++ b/src/V3LinkDot.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link XREF signals/functions together
 //
diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp
index 99943e414..ef1b323dc 100644
--- a/src/V3LinkJump.cpp
+++ b/src/V3LinkJump.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Replace return/continue with jumps
 //
diff --git a/src/V3LinkJump.h b/src/V3LinkJump.h
index d4ebd67b2..d6d960afa 100644
--- a/src/V3LinkJump.h
+++ b/src/V3LinkJump.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Replace return/continue with jumps
 //
diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp
index 892794da7..02005bda0 100644
--- a/src/V3LinkLValue.cpp
+++ b/src/V3LinkLValue.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: LValue module/signal name references
 //
diff --git a/src/V3LinkLValue.h b/src/V3LinkLValue.h
index c009b4a9e..9ac7122b0 100644
--- a/src/V3LinkLValue.h
+++ b/src/V3LinkLValue.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link modules/signals together
 //
diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp
index d22601a1c..bdaa9d28e 100644
--- a/src/V3LinkLevel.cpp
+++ b/src/V3LinkLevel.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Resolve module/signal name references
 //
diff --git a/src/V3LinkLevel.h b/src/V3LinkLevel.h
index c6f643348..1da4b5450 100644
--- a/src/V3LinkLevel.h
+++ b/src/V3LinkLevel.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link modules/signals together
 //
diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp
index ca77022c2..ae3bef99e 100644
--- a/src/V3LinkParse.cpp
+++ b/src/V3LinkParse.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Parse module/signal name references
 //
diff --git a/src/V3LinkParse.h b/src/V3LinkParse.h
index c1d413cfa..ef1e25eee 100644
--- a/src/V3LinkParse.h
+++ b/src/V3LinkParse.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link modules/signals together
 //
diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp
index 41df8d2f9..1245475e2 100644
--- a/src/V3LinkResolve.cpp
+++ b/src/V3LinkResolve.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Resolve module/signal name references
 //
diff --git a/src/V3LinkResolve.h b/src/V3LinkResolve.h
index 49605196c..cbf2022ee 100644
--- a/src/V3LinkResolve.h
+++ b/src/V3LinkResolve.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link modules/signals together
 //
diff --git a/src/V3List.h b/src/V3List.h
index 6d1d76561..0db48e7a5 100644
--- a/src/V3List.h
+++ b/src/V3List.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: List class with storage in existing classes
 //
diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp
index 861a82fb7..7d0a33ef2 100644
--- a/src/V3Localize.cpp
+++ b/src/V3Localize.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Convert BLOCKTEMPs to local variables
 //
diff --git a/src/V3Localize.h b/src/V3Localize.h
index e78b40cf7..fe873624e 100644
--- a/src/V3Localize.h
+++ b/src/V3Localize.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Convert BLOCKTEMPs to local variables
 //
diff --git a/src/V3Name.cpp b/src/V3Name.cpp
index c6ad40fbd..85df84cc3 100644
--- a/src/V3Name.cpp
+++ b/src/V3Name.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Change names for __PVT__'s
 //
diff --git a/src/V3Name.h b/src/V3Name.h
index ba12db593..00bfd5e07 100644
--- a/src/V3Name.h
+++ b/src/V3Name.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Change names for inlining
 //
diff --git a/src/V3Number.cpp b/src/V3Number.cpp
index 463399ffd..efba062e7 100644
--- a/src/V3Number.cpp
+++ b/src/V3Number.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Large 4-state numbers
 //
diff --git a/src/V3Number.h b/src/V3Number.h
index 20fd5e02b..c507ca9da 100644
--- a/src/V3Number.h
+++ b/src/V3Number.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Large 4-state numbers
 //
diff --git a/src/V3Number_test.cpp b/src/V3Number_test.cpp
index 1b4603e21..a420718ff 100644
--- a/src/V3Number_test.cpp
+++ b/src/V3Number_test.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Netlist (top level) functions
 //
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index 724481ec4..424255579 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Options parsing
 //
diff --git a/src/V3Options.h b/src/V3Options.h
index b5bd5a0b1..a2220c4d9 100644
--- a/src/V3Options.h
+++ b/src/V3Options.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Command line options
 //
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index 2f2d62fb3..b515a7c00 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Block code ordering
 //
diff --git a/src/V3Order.h b/src/V3Order.h
index d36689fd5..c2af459b6 100644
--- a/src/V3Order.h
+++ b/src/V3Order.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Block code ordering
 //
diff --git a/src/V3OrderGraph.h b/src/V3OrderGraph.h
index 090d97d89..a28c2a1e6 100644
--- a/src/V3OrderGraph.h
+++ b/src/V3OrderGraph.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Block code ordering
 //
diff --git a/src/V3Param.cpp b/src/V3Param.cpp
index 02a8a8c00..51a7d830a 100644
--- a/src/V3Param.cpp
+++ b/src/V3Param.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Replicate modules for parameterization
 //
diff --git a/src/V3Param.h b/src/V3Param.h
index 5acdeea63..225a83ff5 100644
--- a/src/V3Param.h
+++ b/src/V3Param.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Param modules/signals together
 //
diff --git a/src/V3Parse.h b/src/V3Parse.h
index f4a68ea26..2ee248875 100644
--- a/src/V3Parse.h
+++ b/src/V3Parse.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Reading of Verilog files
 //
diff --git a/src/V3ParseGrammar.cpp b/src/V3ParseGrammar.cpp
index 4d2f41a8b..ae1944b4a 100644
--- a/src/V3ParseGrammar.cpp
+++ b/src/V3ParseGrammar.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Parse syntax tree
 //
diff --git a/src/V3ParseImp.cpp b/src/V3ParseImp.cpp
index b5a18daa2..09d35f4f8 100644
--- a/src/V3ParseImp.cpp
+++ b/src/V3ParseImp.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Netlist (top level) functions
 //
diff --git a/src/V3ParseImp.h b/src/V3ParseImp.h
index dcf994a94..bed5e9ec2 100644
--- a/src/V3ParseImp.h
+++ b/src/V3ParseImp.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Common header between parser and lex
 //
diff --git a/src/V3ParseLex.cpp b/src/V3ParseLex.cpp
index 2de4bd98b..d847ca6b3 100644
--- a/src/V3ParseLex.cpp
+++ b/src/V3ParseLex.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Netlist (top level) functions
 //
diff --git a/src/V3PreLex.h b/src/V3PreLex.h
index 79c6ecf9e..91e55f51b 100644
--- a/src/V3PreLex.h
+++ b/src/V3PreLex.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilog::Preproc: Internal header for lex interfacing
 //
diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp
index 0fae023e0..c6412893a 100644
--- a/src/V3PreProc.cpp
+++ b/src/V3PreProc.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilog::Preproc: Internal implementation of default preprocessor
 //
diff --git a/src/V3PreProc.h b/src/V3PreProc.h
index 5cd20034d..bdb42f71f 100644
--- a/src/V3PreProc.h
+++ b/src/V3PreProc.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilog::Preproc: Preprocess verilog code
 //
diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp
index a26e3b1cc..85d227014 100644
--- a/src/V3PreShell.cpp
+++ b/src/V3PreShell.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Preprocessing wrapper
 //
diff --git a/src/V3PreShell.h b/src/V3PreShell.h
index 1910f5e56..e60c09a27 100644
--- a/src/V3PreShell.h
+++ b/src/V3PreShell.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Preprocessing wrapper program
 //
diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp
index 656f74536..e700d1776 100644
--- a/src/V3Premit.cpp
+++ b/src/V3Premit.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for premit nodes
 //
diff --git a/src/V3Premit.h b/src/V3Premit.h
index d0f62a735..68579a3d3 100644
--- a/src/V3Premit.h
+++ b/src/V3Premit.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Pre C-Emit stage changes
 //
diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp
index f56b3203f..5fd6671b2 100644
--- a/src/V3Scope.cpp
+++ b/src/V3Scope.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity block domains
 //
diff --git a/src/V3Scope.h b/src/V3Scope.h
index e6f309360..2d39aca56 100644
--- a/src/V3Scope.h
+++ b/src/V3Scope.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity block domains
 //
diff --git a/src/V3SenTree.h b/src/V3SenTree.h
index 78144d3eb..130a78768 100644
--- a/src/V3SenTree.h
+++ b/src/V3SenTree.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into sensitivity block domains
 //
diff --git a/src/V3Simulate.h b/src/V3Simulate.h
index d9a7c20bc..5e4fdf5e2 100644
--- a/src/V3Simulate.h
+++ b/src/V3Simulate.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Simulate code to determine output values/variables
 //
diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp
index 8fe635b69..2265b1e8d 100644
--- a/src/V3Slice.cpp
+++ b/src/V3Slice.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Parse module/signal name references
 //
diff --git a/src/V3Slice.h b/src/V3Slice.h
index 5297812d6..968bddfb2 100644
--- a/src/V3Slice.h
+++ b/src/V3Slice.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Link modules/signals together
 //
diff --git a/src/V3Split.cpp b/src/V3Split.cpp
index 4c3d038d5..a63922b9c 100644
--- a/src/V3Split.cpp
+++ b/src/V3Split.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into separate statements to reduce temps
 //
diff --git a/src/V3Split.h b/src/V3Split.h
index 6b48a7c80..3d15b78f6 100644
--- a/src/V3Split.h
+++ b/src/V3Split.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into separate statements to reduce temps
 //
diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp
index fdb60dfcd..49aaeecaf 100644
--- a/src/V3SplitAs.cpp
+++ b/src/V3SplitAs.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into separate statements to reduce temps
 //
diff --git a/src/V3SplitAs.h b/src/V3SplitAs.h
index e6c95c990..850670ebb 100644
--- a/src/V3SplitAs.h
+++ b/src/V3SplitAs.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Break always into separate statements to reduce temps
 //
diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp
index a90281906..7151a49f5 100644
--- a/src/V3Stats.cpp
+++ b/src/V3Stats.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Collect and print statistics
 //
diff --git a/src/V3Stats.h b/src/V3Stats.h
index bb43fd6ae..412361d2f 100644
--- a/src/V3Stats.h
+++ b/src/V3Stats.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Collect and print statistics
 //
diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp
index 036575c2e..0aadab4f5 100644
--- a/src/V3StatsReport.cpp
+++ b/src/V3StatsReport.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Collect and print statistics
 //
diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp
index d2e79c4d9..4e5c428c4 100644
--- a/src/V3Subst.cpp
+++ b/src/V3Subst.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Substitute constants and expressions in expr temp's
 //
diff --git a/src/V3Subst.h b/src/V3Subst.h
index 0dda33df1..7ca2232fa 100644
--- a/src/V3Subst.h
+++ b/src/V3Subst.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Substitute constants and expressions in expr temp's
 //
diff --git a/src/V3SymTable.h b/src/V3SymTable.h
index 29e54aada..852abbcff 100644
--- a/src/V3SymTable.h
+++ b/src/V3SymTable.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Symbol table
 //
diff --git a/src/V3Table.cpp b/src/V3Table.cpp
index fe45fa044..1e2e91936 100644
--- a/src/V3Table.cpp
+++ b/src/V3Table.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Make lookup tables
 //
diff --git a/src/V3Table.h b/src/V3Table.h
index 330500523..45c438b26 100644
--- a/src/V3Table.h
+++ b/src/V3Table.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Make lookup tables
 //
diff --git a/src/V3Task.cpp b/src/V3Task.cpp
index 5c7d2ebb7..901abf63a 100644
--- a/src/V3Task.cpp
+++ b/src/V3Task.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for task nodes
 //
diff --git a/src/V3Task.h b/src/V3Task.h
index a2aa9219a..2e6e3ac6d 100644
--- a/src/V3Task.h
+++ b/src/V3Task.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Inlining of modules
 //
diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp
index db15ef5bd..cb9e9ef45 100644
--- a/src/V3Trace.cpp
+++ b/src/V3Trace.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Waves tracing
 //
diff --git a/src/V3Trace.h b/src/V3Trace.h
index 978c34b28..71c0ab685 100644
--- a/src/V3Trace.h
+++ b/src/V3Trace.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Waves Tracing
 //
diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp
index 7902c20a5..fdb5fc227 100644
--- a/src/V3TraceDecl.cpp
+++ b/src/V3TraceDecl.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Waves tracing
 //
diff --git a/src/V3TraceDecl.h b/src/V3TraceDecl.h
index b08534bba..2527bfd31 100644
--- a/src/V3TraceDecl.h
+++ b/src/V3TraceDecl.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Waves Tracing
 //
diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp
index cf51dd4a5..3f310c060 100644
--- a/src/V3Tristate.cpp
+++ b/src/V3Tristate.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Deals with tristate logic
 //
diff --git a/src/V3Tristate.h b/src/V3Tristate.h
index 71964d076..c49bcdb63 100644
--- a/src/V3Tristate.h
+++ b/src/V3Tristate.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add Unknown assigns
 //
diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp
index ebcbcad94..0489bef1a 100644
--- a/src/V3Undriven.cpp
+++ b/src/V3Undriven.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Check for unused/undriven signals
 //
diff --git a/src/V3Undriven.h b/src/V3Undriven.h
index 38942e7c0..f9ae76583 100644
--- a/src/V3Undriven.h
+++ b/src/V3Undriven.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Check for unused/undriven signals
 //
diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp
index 2957b9ef7..ceeae74cf 100644
--- a/src/V3Unknown.cpp
+++ b/src/V3Unknown.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add Unknown assigns
 //
diff --git a/src/V3Unknown.h b/src/V3Unknown.h
index 684dc7368..a10436ffc 100644
--- a/src/V3Unknown.h
+++ b/src/V3Unknown.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add Unknown assigns
 //
diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp
index fd7a3f11e..1e82787e8 100644
--- a/src/V3Unroll.cpp
+++ b/src/V3Unroll.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Add temporaries, such as for unroll nodes
 //
diff --git a/src/V3Unroll.h b/src/V3Unroll.h
index b56fc9088..77bf081f1 100644
--- a/src/V3Unroll.h
+++ b/src/V3Unroll.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Pre C-Emit stage changes
 //
diff --git a/src/V3Width.cpp b/src/V3Width.cpp
index d3723a46d..c5b4f82c9 100644
--- a/src/V3Width.cpp
+++ b/src/V3Width.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Expression width calculations
 //
diff --git a/src/V3Width.h b/src/V3Width.h
index c52804903..c61c4770b 100644
--- a/src/V3Width.h
+++ b/src/V3Width.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Node attributes/ expression widths
 //
diff --git a/src/V3WidthCommit.h b/src/V3WidthCommit.h
index 6cc6fe0a3..9caf07414 100644
--- a/src/V3WidthCommit.h
+++ b/src/V3WidthCommit.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Cleanup stage in V3Width
 //
diff --git a/src/V3WidthSel.cpp b/src/V3WidthSel.cpp
index c699c10e2..2f5edbf50 100644
--- a/src/V3WidthSel.cpp
+++ b/src/V3WidthSel.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Expression width calculations
 //
diff --git a/src/Verilator.cpp b/src/Verilator.cpp
index 20df88548..53d429ea3 100644
--- a/src/Verilator.cpp
+++ b/src/Verilator.cpp
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: main()
 //
diff --git a/src/astgen b/src/astgen
index 7d137403e..d7c294500 100755
--- a/src/astgen
+++ b/src/astgen
@@ -135,7 +135,7 @@ sub read_refs {
 sub open_file {
     my $filename = shift;
     my $fh = IO::File->new($filename,"w") or die "%Error: $! $filename,";
-    print $fh "// Generated by astgen // -*- C++ -*-\n";
+    print $fh '// Generated by astgen // -*- mode: C++; c-file-style: "cc-mode" -*-'."\n";
     return $fh;
 }
 
diff --git a/src/config_build.h.in b/src/config_build.h.in
index 6565a3248..dd8dac755 100644
--- a/src/config_build.h.in
+++ b/src/config_build.h.in
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Configure source; system configuration
 //
diff --git a/src/verilog.y b/src/verilog.y
index c79fb4525..92f8cfbe5 100644
--- a/src/verilog.y
+++ b/src/verilog.y
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 // DESCRIPTION: Verilator: Bison grammer file
 //
diff --git a/test_regress/t/t_clk_2in.cpp b/test_regress/t/t_clk_2in.cpp
index a3afaf3b5..e44d31cb1 100644
--- a/test_regress/t/t_clk_2in.cpp
+++ b/test_regress/t/t_clk_2in.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // DESCRIPTION: Verilator: Verilog Test module
 //
 // This file ONLY is placed into the Public Domain, for any use,
diff --git a/test_regress/t/t_dpi_accessors.cpp b/test_regress/t/t_dpi_accessors.cpp
index ef9dbb13a..b30aafdd0 100644
--- a/test_regress/t/t_dpi_accessors.cpp
+++ b/test_regress/t/t_dpi_accessors.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2012 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_context_c.cpp b/test_regress/t/t_dpi_context_c.cpp
index 3610be8b4..4839f4b9e 100644
--- a/test_regress/t/t_dpi_context_c.cpp
+++ b/test_regress/t/t_dpi_context_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2009 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_display_c.cpp b/test_regress/t/t_dpi_display_c.cpp
index 2c02d30d4..39a38d53d 100644
--- a/test_regress/t/t_dpi_display_c.cpp
+++ b/test_regress/t/t_dpi_display_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2011 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_export_c.cpp b/test_regress/t/t_dpi_export_c.cpp
index b343a8e12..6d5c2cdd5 100644
--- a/test_regress/t/t_dpi_export_c.cpp
+++ b/test_regress/t/t_dpi_export_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2009 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_import_c.cpp b/test_regress/t/t_dpi_import_c.cpp
index 1340e1fa1..2841b6414 100644
--- a/test_regress/t/t_dpi_import_c.cpp
+++ b/test_regress/t/t_dpi_import_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2009 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_qw_c.cpp b/test_regress/t/t_dpi_qw_c.cpp
index b8af96eda..512b35428 100644
--- a/test_regress/t/t_dpi_qw_c.cpp
+++ b/test_regress/t/t_dpi_qw_c.cpp
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // DESCRIPTION: Verilator: Verilog Test module
 //
 // Copyright 2009 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_shortcircuit_c.cpp b/test_regress/t/t_dpi_shortcircuit_c.cpp
index 0090188a1..b5024e5f4 100644
--- a/test_regress/t/t_dpi_shortcircuit_c.cpp
+++ b/test_regress/t/t_dpi_shortcircuit_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2011-2011 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_sys_c.cpp b/test_regress/t/t_dpi_sys_c.cpp
index b7473d15e..e3e24ff66 100644
--- a/test_regress/t/t_dpi_sys_c.cpp
+++ b/test_regress/t/t_dpi_sys_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2009-2009 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_dpi_var.cpp b/test_regress/t/t_dpi_var.cpp
index 30a70796b..af86f950f 100644
--- a/test_regress/t/t_dpi_var.cpp
+++ b/test_regress/t/t_dpi_var.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2010-2011 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_embed1_c.cpp b/test_regress/t/t_embed1_c.cpp
index 54261bb5c..f80477928 100644
--- a/test_regress/t/t_embed1_c.cpp
+++ b/test_regress/t/t_embed1_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2011-2011 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_extend_class_c.h b/test_regress/t/t_extend_class_c.h
index f609d5d41..99cbae11a 100644
--- a/test_regress/t/t_extend_class_c.h
+++ b/test_regress/t/t_extend_class_c.h
@@ -1,8 +1,9 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // DESCRIPTION: Verilator: Verilog Test module
 //
 // This file ONLY is placed into the Public Domain, for any use,
-// without warranty, 2006-2007 by Wilson Snyder.
+// without warranty, 2006-2009 by Wilson Snyder.
 
 class t_extend_class_c {
 public:
diff --git a/test_regress/t/t_flag_ldflags_a.cpp b/test_regress/t/t_flag_ldflags_a.cpp
index 70dbd98c9..eb2d8eb14 100644
--- a/test_regress/t/t_flag_ldflags_a.cpp
+++ b/test_regress/t/t_flag_ldflags_a.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2010-2011 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_flag_ldflags_c.cpp b/test_regress/t/t_flag_ldflags_c.cpp
index 8573c30c0..bf88d0e54 100644
--- a/test_regress/t/t_flag_ldflags_c.cpp
+++ b/test_regress/t/t_flag_ldflags_c.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2010-2011 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_flag_ldflags_so.cpp b/test_regress/t/t_flag_ldflags_so.cpp
index 0c73c390c..e861153b5 100644
--- a/test_regress/t/t_flag_ldflags_so.cpp
+++ b/test_regress/t/t_flag_ldflags_so.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2010-2011 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_func_rand.cpp b/test_regress/t/t_func_rand.cpp
index 0877c25d7..e09939ef6 100644
--- a/test_regress/t/t_func_rand.cpp
+++ b/test_regress/t/t_func_rand.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // DESCRIPTION: Verilator: Verilog Test module
 //
 // This file ONLY is placed into the Public Domain, for any use,
diff --git a/test_regress/t/t_leak.cpp b/test_regress/t/t_leak.cpp
index 4264a67b0..591d4b719 100644
--- a/test_regress/t/t_leak.cpp
+++ b/test_regress/t/t_leak.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // DESCRIPTION: Verilator: Verilog Test driver/expect definition
 //
 // Copyright 2003-2009 by Wilson Snyder. This program is free software; you can
diff --git a/test_regress/t/t_math_imm2.cpp b/test_regress/t/t_math_imm2.cpp
index cd552a560..9db3e0e9b 100644
--- a/test_regress/t/t_math_imm2.cpp
+++ b/test_regress/t/t_math_imm2.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+
 #include <verilated.h>
 #include "Vt_math_imm2.h"
 
diff --git a/test_regress/t/t_mem_multi_io2.cpp b/test_regress/t/t_mem_multi_io2.cpp
index 0954fc209..f4fbfa4d6 100644
--- a/test_regress/t/t_mem_multi_io2.cpp
+++ b/test_regress/t/t_mem_multi_io2.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // This file ONLY is placed into the Public Domain, for any use,
 // without warranty, 2008 by Lane Brooks
 
diff --git a/test_regress/t/t_mem_slot.cpp b/test_regress/t/t_mem_slot.cpp
index 5394c9b4a..a52017b0e 100644
--- a/test_regress/t/t_mem_slot.cpp
+++ b/test_regress/t/t_mem_slot.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+
 #include <cstdlib>
 #include <verilated.h>
 #include "Vt_mem_slot.h"
diff --git a/test_regress/t/t_trace_public_func.cpp b/test_regress/t/t_trace_public_func.cpp
index 69ad5e915..8a1aafd82 100644
--- a/test_regress/t/t_trace_public_func.cpp
+++ b/test_regress/t/t_trace_public_func.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // DESCRIPTION: Verilator: Verilog Test module
 //
 // This file ONLY is placed into the Public Domain, for any use,
diff --git a/test_regress/t/t_trace_public_sig.cpp b/test_regress/t/t_trace_public_sig.cpp
index d24086e35..4ad487d7b 100644
--- a/test_regress/t/t_trace_public_sig.cpp
+++ b/test_regress/t/t_trace_public_sig.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // DESCRIPTION: Verilator: Verilog Test module
 //
 // This file ONLY is placed into the Public Domain, for any use,
diff --git a/test_regress/t/t_tri_gate.cpp b/test_regress/t/t_tri_gate.cpp
index 7731535db..effb3f15c 100644
--- a/test_regress/t/t_tri_gate.cpp
+++ b/test_regress/t/t_tri_gate.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // This file ONLY is placed into the Public Domain, for any use,
 // without warranty, 2008 by Lane Brooks
 
diff --git a/test_regress/t/t_tri_inout.cpp b/test_regress/t/t_tri_inout.cpp
index 8b258c14a..1c899f41e 100644
--- a/test_regress/t/t_tri_inout.cpp
+++ b/test_regress/t/t_tri_inout.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // This file ONLY is placed into the Public Domain, for any use,
 // without warranty, 2008 by Lane Brooks
 
diff --git a/test_regress/t/t_tri_pullup.cpp b/test_regress/t/t_tri_pullup.cpp
index 31e101a22..c35973b2b 100644
--- a/test_regress/t/t_tri_pullup.cpp
+++ b/test_regress/t/t_tri_pullup.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
 // This file ONLY is placed into the Public Domain, for any use,
 // without warranty, 2008 by Lane Brooks
 
diff --git a/test_regress/t/t_tri_select.cpp b/test_regress/t/t_tri_select.cpp
index 0afb0e5fd..2c3fceae6 100644
--- a/test_regress/t/t_tri_select.cpp
+++ b/test_regress/t/t_tri_select.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+
 #include "Vt_tri_select.h"
 
 Vt_tri_select *tb = NULL;
diff --git a/test_regress/t/t_var_pinsizes.cpp b/test_regress/t/t_var_pinsizes.cpp
index a347e9ea5..758fc06b7 100644
--- a/test_regress/t/t_var_pinsizes.cpp
+++ b/test_regress/t/t_var_pinsizes.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+
 #ifdef T_VAR_PINS_CC
 # include "Vt_var_pins_cc.h"
 #elif defined(T_VAR_PINS_SC1)
diff --git a/test_regress/t/t_vpi_var.cpp b/test_regress/t/t_vpi_var.cpp
index 7df34e983..fbc24d627 100644
--- a/test_regress/t/t_vpi_var.cpp
+++ b/test_regress/t/t_vpi_var.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
 // Copyright 2010-2011 by Wilson Snyder. This program is free software; you can