diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c36b631..05d4f612 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,6 +209,8 @@ set(STA_SOURCE
   )
 
 set(STA_HEADERS
+  include/sta/Sta.hh
+
   app/StaMain.hh
   
   dcalc/ArcDelayCalc.hh
@@ -340,7 +342,6 @@ set(STA_HEADERS
   search/SearchClass.hh
   search/SearchPred.hh
   search/Sim.hh
-  search/Sta.hh
   search/StaState.hh
   search/Tag.hh
   search/TagGroup.hh
@@ -635,6 +636,10 @@ add_library(OpenSTA
 
 target_include_directories(OpenSTA
   PUBLIC
+  include
+
+  PRIVATE
+  ${STA_HOME}
   ${STA_INCLUDE_DIRS}
   ${CUDD_INCLUDE}
   ${TCL_INCLUDE_PATH}
diff --git a/search/Sta.hh b/include/sta/Sta.hh
similarity index 99%
rename from search/Sta.hh
rename to include/sta/Sta.hh
index bdaf12a6..033669e6 100644
--- a/search/Sta.hh
+++ b/include/sta/Sta.hh
@@ -17,16 +17,17 @@
 #pragma once
 
 #include <string>
-#include "DisallowCopyAssign.hh"
-#include "StringSeq.hh"
-#include "StaState.hh"
-#include "LibertyClass.hh"
-#include "NetworkClass.hh"
-#include "SdcClass.hh"
-#include "GraphClass.hh"
-#include "SearchClass.hh"
-#include "ParasiticsClass.hh"
-#include "VertexVisitor.hh"
+#include "util/Machine.hh"
+#include "util/DisallowCopyAssign.hh"
+#include "util/StringSeq.hh"
+#include "liberty/LibertyClass.hh"
+#include "network/NetworkClass.hh"
+#include "sdc/SdcClass.hh"
+#include "graph/GraphClass.hh"
+#include "parasitics/ParasiticsClass.hh"
+#include "search/StaState.hh"
+#include "search/VertexVisitor.hh"
+#include "search/SearchClass.hh"
 
 struct Tcl_Interp;
 
diff --git a/search/Power.hh b/search/Power.hh
index e2c891da..97daa64c 100644
--- a/search/Power.hh
+++ b/search/Power.hh
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "Sta.hh"
+#include "sta/Sta.hh"
 
 namespace sta {
 
diff --git a/search/Sta.cc b/search/Sta.cc
index 6e9a5f8f..d70f4fae 100644
--- a/search/Sta.cc
+++ b/search/Sta.cc
@@ -14,62 +14,57 @@
 // 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 "sta/Sta.hh"
+
 #include <limits>
-#include "Machine.hh"
-#include "DisallowCopyAssign.hh"
-#include "DispatchQueue.hh"
-#include "ReportTcl.hh"
-#include "Debug.hh"
-#include "Stats.hh"
-#include "Units.hh"
-#include "Fuzzy.hh"
-#include "PortDirection.hh"
-#include "TimingRole.hh"
-#include "TimingArc.hh"
-#include "FuncExpr.hh"
-#include "EquivCells.hh"
-#include "Liberty.hh"
-#include "LibertyReader.hh"
-#include "Network.hh"
-#include "MakeConcreteNetwork.hh"
-#include "VerilogReader.hh"
-#include "SdcNetwork.hh"
-#include "Graph.hh"
-#include "GraphCmp.hh"
-#include "Levelize.hh"
-#include "Sdc.hh"
-#include "WriteSdc.hh"
-#include "ExceptionPath.hh"
-#include "MakeConcreteParasitics.hh"
-#include "Parasitics.hh"
-#include "DelayCalc.hh"
-#include "ArcDelayCalc.hh"
-#include "GraphDelayCalc1.hh"
-#include "DcalcAnalysisPt.hh"
-#include "Sim.hh"
-#include "ClkInfo.hh"
-#include "Tag.hh"
-#include "TagGroup.hh"
-#include "PathVertex.hh"
-#include "PathAnalysisPt.hh"
-#include "Corner.hh"
-#include "Search.hh"
-#include "Latches.hh"
-#include "PathGroup.hh"
-#include "CheckTiming.hh"
-#include "SpefReader.hh"
-#include "CheckSlewLimits.hh"
-#include "CheckMinPulseWidths.hh"
-#include "CheckMinPeriods.hh"
-#include "CheckMaxSkews.hh"
-#include "ClkSkew.hh"
-#include "FindRegister.hh"
-#include "ReportPath.hh"
-#include "VisitPathGroupVertices.hh"
-#include "SdfWriter.hh"
-#include "Genclks.hh"
-#include "Power.hh"
-#include "Sta.hh"
+
+#include "util/DispatchQueue.hh"
+#include "util/ReportTcl.hh"
+#include "util/Debug.hh"
+#include "util/Stats.hh"
+#include "util/Fuzzy.hh"
+#include "liberty/Units.hh"
+#include "liberty/TimingArc.hh"
+#include "liberty/FuncExpr.hh"
+#include "liberty/EquivCells.hh"
+#include "liberty/Liberty.hh"
+#include "liberty/LibertyReader.hh"
+#include "network/SdcNetwork.hh"
+#include "network/MakeConcreteNetwork.hh"
+#include "network/PortDirection.hh"
+#include "verilog/VerilogReader.hh"
+#include "graph/Graph.hh"
+#include "graph/GraphCmp.hh"
+#include "sdc/Sdc.hh"
+#include "sdc/WriteSdc.hh"
+#include "sdc/ExceptionPath.hh"
+#include "parasitics/MakeConcreteParasitics.hh"
+#include "parasitics/Parasitics.hh"
+#include "parasitics/SpefReader.hh"
+#include "dcalc/DelayCalc.hh"
+#include "dcalc/ArcDelayCalc.hh"
+#include "dcalc/GraphDelayCalc1.hh"
+#include "sdf/SdfWriter.hh"
+#include "search/Levelize.hh"
+#include "search/Sim.hh"
+#include "search/ClkInfo.hh"
+#include "search/TagGroup.hh"
+#include "search/PathAnalysisPt.hh"
+#include "search/Corner.hh"
+#include "search/Search.hh"
+#include "search/Latches.hh"
+#include "search/PathGroup.hh"
+#include "search/CheckTiming.hh"
+#include "search/CheckSlewLimits.hh"
+#include "search/CheckMinPulseWidths.hh"
+#include "search/CheckMinPeriods.hh"
+#include "search/CheckMaxSkews.hh"
+#include "search/ClkSkew.hh"
+#include "search/FindRegister.hh"
+#include "search/ReportPath.hh"
+#include "search/VisitPathGroupVertices.hh"
+#include "search/Genclks.hh"
+#include "search/Power.hh"
 
 namespace sta {