diff --git a/verilog/VerilogReader.hh b/include/sta/VerilogReader.hh
similarity index 100%
rename from verilog/VerilogReader.hh
rename to include/sta/VerilogReader.hh
diff --git a/verilog/VerilogWriter.hh b/include/sta/VerilogWriter.hh
similarity index 100%
rename from verilog/VerilogWriter.hh
rename to include/sta/VerilogWriter.hh
diff --git a/search/Sta.cc b/search/Sta.cc
index acc287c7..da1384da 100644
--- a/search/Sta.cc
+++ b/search/Sta.cc
@@ -31,7 +31,7 @@
 #include "SdcNetwork.hh"
 #include "MakeConcreteNetwork.hh"
 #include "PortDirection.hh"
-#include "verilog/VerilogReader.hh"
+#include "VerilogReader.hh"
 #include "Graph.hh"
 #include "GraphCmp.hh"
 #include "Sdc.hh"
diff --git a/util/Machine.hh b/util/Machine.hh
index bb26047f..12cb9be1 100644
--- a/util/Machine.hh
+++ b/util/Machine.hh
@@ -17,8 +17,6 @@
 #pragma once
 
 // This header contains global os/port specific definitions.
-// It should be included in every source file after any system include
-// files and before any STA include files.
 
 // Pragma placeholder for non-gcc compilers.
 #ifndef __GNUC__
diff --git a/verilog/Verilog.i b/verilog/Verilog.i
index b34f6c3e..34f7609a 100644
--- a/verilog/Verilog.i
+++ b/verilog/Verilog.i
@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "verilog/VerilogReader.hh"
-#include "verilog/VerilogWriter.hh"
+#include "VerilogReader.hh"
+#include "VerilogWriter.hh"
 #include "Sta.hh"
 
 using sta::Sta;
diff --git a/verilog/VerilogParse.yy b/verilog/VerilogParse.yy
index 471349f9..627d7ac1 100644
--- a/verilog/VerilogParse.yy
+++ b/verilog/VerilogParse.yy
@@ -20,7 +20,7 @@
 
 #include "PortDirection.hh"
 #include "verilog/VerilogReaderPvt.hh"
-#include "verilog/VerilogReader.hh"
+#include "VerilogReader.hh"
 
 int VerilogLex_lex();
 #define VerilogParse_lex VerilogLex_lex
diff --git a/verilog/VerilogReader.cc b/verilog/VerilogReader.cc
index 867a4343..aeca09b1 100644
--- a/verilog/VerilogReader.cc
+++ b/verilog/VerilogReader.cc
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "verilog/VerilogReader.hh"
+#include "VerilogReader.hh"
 
 #include <stdlib.h>
 
diff --git a/verilog/VerilogWriter.cc b/verilog/VerilogWriter.cc
index f70acdb6..52ffc0f4 100644
--- a/verilog/VerilogWriter.cc
+++ b/verilog/VerilogWriter.cc
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "verilog/VerilogWriter.hh"
+#include "VerilogWriter.hh"
 
 #include <stdlib.h>