public headers in include/sta

.gitignore

@@ -12,7 +12,7 @@ gmon.out
 build
 pvt
 
-util/StaConfig.hh
+include/sta/StaConfig.hh
 
 app/sta
 app/libOpenSTA.*

CMakeLists.txt

@@ -234,6 +234,8 @@ set(STA_PVT_HEADERS
   parasitics/SpefNamespace.hh
   parasitics/SpefReader.hh
 
+  sdc/WriteSdcPvt.hh
+
   sdf/ReportAnnotation.hh
   sdf/Sdf.hh
   sdf/SdfReader.hh
@@ -254,17 +256,13 @@ set(STA_PVT_HEADERS
   search/PathEnumed.hh
   search/PathEnum.hh
   search/PathVertex.hh
-  search/PathVertexRep.hh
-  search/PathRef.hh
   search/ReportPath.hh
   search/Sim.hh
-  search/StaState.hh
   search/Tag.hh
   search/TagGroup.hh
   search/VisitPathGroupVertices.hh
   search/WorstSlack.hh
 
-  util/StaConfig.hh
   util/Machine.hh
 
   verilog/VerilogReaderPvt.hh
@@ -273,124 +271,129 @@ set(STA_PVT_HEADERS
   )
 
 set(STA_PUBLIC_HEADERS
-  include/sta/app/StaMain.hh
+  include/sta/StaMain.hh
 
-  include/sta/dcalc/ArcDelayCalc.hh
-  include/sta/dcalc/DelayCalc.hh
-  include/sta/dcalc/GraphDelayCalc.hh
-  include/sta/dcalc/DcalcAnalysisPt.hh
+  include/sta/ArcDelayCalc.hh
+  include/sta/DelayCalc.hh
+  include/sta/GraphDelayCalc.hh
+  include/sta/DcalcAnalysisPt.hh
 
-  include/sta/graph/Delay.hh
-  include/sta/graph/DelayFloat.hh
-  include/sta/graph/DelayNormal1.hh
-  include/sta/graph/DelayNormal2.hh
-  include/sta/graph/Graph.hh
-  include/sta/graph/GraphClass.hh
-  include/sta/graph/GraphCmp.hh
-  include/sta/graph/VertexId.hh
+  include/sta/Delay.hh
+  include/sta/DelayFloat.hh
+  include/sta/DelayNormal1.hh
+  include/sta/DelayNormal2.hh
+  include/sta/Graph.hh
+  include/sta/GraphClass.hh
+  include/sta/GraphCmp.hh
+  include/sta/VertexId.hh
 
-  include/sta/liberty/EquivCells.hh
-  include/sta/liberty/FuncExpr.hh
-  include/sta/liberty/InternalPower.hh
-  include/sta/liberty/LeakagePower.hh
-  include/sta/liberty/Liberty.hh
-  include/sta/liberty/LibertyClass.hh
-  include/sta/liberty/Sequential.hh
-  include/sta/liberty/TableModel.hh
-  include/sta/liberty/LinearModel.hh
-  include/sta/liberty/TimingArc.hh
-  include/sta/liberty/TimingModel.hh
-  include/sta/liberty/TimingRole.hh
-  include/sta/liberty/Transition.hh
-  include/sta/liberty/Units.hh
-  include/sta/liberty/Wireload.hh
+  include/sta/EquivCells.hh
+  include/sta/FuncExpr.hh
+  include/sta/InternalPower.hh
+  include/sta/LeakagePower.hh
+  include/sta/Liberty.hh
+  include/sta/LibertyClass.hh
+  include/sta/Sequential.hh
+  include/sta/TableModel.hh
+  include/sta/LinearModel.hh
+  include/sta/TimingArc.hh
+  include/sta/TimingModel.hh
+  include/sta/TimingRole.hh
+  include/sta/Transition.hh
+  include/sta/Units.hh
+  include/sta/Wireload.hh
 
-  include/sta/network/ConcreteLibrary.hh
-  include/sta/network/ConcreteNetwork.hh
-  include/sta/network/HpinDrvrLoad.hh
-  include/sta/network/MakeConcreteNetwork.hh
-  include/sta/network/Network.hh
-  include/sta/network/NetworkClass.hh
-  include/sta/network/NetworkCmp.hh
-  include/sta/network/ParseBus.hh
-  include/sta/network/PortDirection.hh
-  include/sta/network/SdcNetwork.hh
-  include/sta/network/VerilogNamespace.hh
+  include/sta/ConcreteLibrary.hh
+  include/sta/ConcreteNetwork.hh
+  include/sta/HpinDrvrLoad.hh
+  include/sta/MakeConcreteNetwork.hh
+  include/sta/Network.hh
+  include/sta/NetworkClass.hh
+  include/sta/NetworkCmp.hh
+  include/sta/ParseBus.hh
+  include/sta/PortDirection.hh
+  include/sta/SdcNetwork.hh
+  include/sta/VerilogNamespace.hh
 
-  include/sta/parasitics/MakeConcreteParasitics.hh
-  include/sta/parasitics/NullParasitics.hh
-  include/sta/parasitics/Parasitics.hh
-  include/sta/parasitics/ParasiticsClass.hh
+  include/sta/MakeConcreteParasitics.hh
+  include/sta/NullParasitics.hh
+  include/sta/Parasitics.hh
+  include/sta/ParasiticsClass.hh
 
-  include/sta/sdc/Clock.hh
-  include/sta/sdc/ClockGatingCheck.hh
-  include/sta/sdc/ClockGroups.hh
-  include/sta/sdc/ClockInsertion.hh
-  include/sta/sdc/ClockLatency.hh
-  include/sta/sdc/CycleAccting.hh
-  include/sta/sdc/DataCheck.hh
-  include/sta/sdc/DeratingFactors.hh
-  include/sta/sdc/DisabledPorts.hh
-  include/sta/sdc/ExceptionPath.hh
-  include/sta/sdc/InputDrive.hh
-  include/sta/sdc/MinMaxValues.hh
-  include/sta/sdc/PinPair.hh
-  include/sta/sdc/PortDelay.hh
-  include/sta/sdc/PortExtCap.hh
-  include/sta/sdc/RiseFallMinMax.hh
-  include/sta/sdc/RiseFallValues.hh
-  include/sta/sdc/Sdc.hh
-  include/sta/sdc/SdcClass.hh
-  include/sta/sdc/SdcCmdComment.hh
-  include/sta/sdc/WriteSdc.hh
-  include/sta/sdc/WriteSdcPvt.hh
+  include/sta/Clock.hh
+  include/sta/ClockGatingCheck.hh
+  include/sta/ClockGroups.hh
+  include/sta/ClockInsertion.hh
+  include/sta/ClockLatency.hh
+  include/sta/CycleAccting.hh
+  include/sta/DataCheck.hh
+  include/sta/DeratingFactors.hh
+  include/sta/DisabledPorts.hh
+  include/sta/ExceptionPath.hh
+  include/sta/InputDrive.hh
+  include/sta/MinMaxValues.hh
+  include/sta/PinPair.hh
+  include/sta/PortDelay.hh
+  include/sta/PortExtCap.hh
+  include/sta/RiseFallMinMax.hh
+  include/sta/RiseFallValues.hh
+  include/sta/Sdc.hh
+  include/sta/SdcClass.hh
+  include/sta/SdcCmdComment.hh
+  include/sta/WriteSdc.hh
 
-  include/sta/search/Bfs.hh
-  include/sta/search/ClkInfo.hh
-  include/sta/search/Corner.hh
-  include/sta/search/Path.hh
-  include/sta/search/PathAnalysisPt.hh
-  include/sta/search/PathEnd.hh
-  include/sta/search/PathExpanded.hh
-  include/sta/search/PathGroup.hh
-  include/sta/search/Power.hh
-  include/sta/search/Property.hh
-  include/sta/search/Search.hh
-  include/sta/search/SearchClass.hh
-  include/sta/search/SearchPred.hh
-  include/sta/search/VertexVisitor.hh
-  include/sta/search/VisitPathEnds.hh
-  include/sta/search/WritePathSpice.hh
+  include/sta/Bfs.hh
+  include/sta/ClkInfo.hh
+  include/sta/Corner.hh
+  include/sta/Path.hh
+  include/sta/PathAnalysisPt.hh
+  include/sta/PathEnd.hh
+  include/sta/PathExpanded.hh
+  include/sta/PathGroup.hh
+  include/sta/PathRef.hh
+  include/sta/PathVertex.hh
+  include/sta/PathVertexRep.hh
+  include/sta/Power.hh
+  include/sta/Property.hh
+  include/sta/Search.hh
+  include/sta/SearchClass.hh
+  include/sta/SearchPred.hh
+  include/sta/Sta.hh
+  include/sta/StaState.hh
+  include/sta/VertexVisitor.hh
+  include/sta/VisitPathEnds.hh
+  include/sta/WritePathSpice.hh
 
-  include/sta/util/ArrayTable.hh
-  include/sta/util/Debug.hh
-  include/sta/util/DispatchQueue.hh
-  include/sta/util/DisallowCopyAssign.hh
-  include/sta/util/EnumNameMap.hh
-  include/sta/util/Error.hh
-  include/sta/util/Fuzzy.hh
-  include/sta/util/Hash.hh
-  include/sta/util/HashSet.hh
-  include/sta/util/Iterator.hh
-  include/sta/util/Map.hh
-  include/sta/util/MinMax.hh
-  include/sta/util/Mutex.hh
-  include/sta/util/ObjectId.hh
-  include/sta/util/ObjectTable.hh
-  include/sta/util/PatternMatch.hh
-  include/sta/util/Report.hh
-  include/sta/util/ReportStd.hh
-  include/sta/util/ReportTcl.hh
-  include/sta/util/Set.hh
-  include/sta/util/Stats.hh
-  include/sta/util/StringSeq.hh
-  include/sta/util/StringSet.hh
-  include/sta/util/StringUtil.hh
-  include/sta/util/TokenParser.hh
-  include/sta/util/UnorderedMap.hh
-  include/sta/util/UnorderedSet.hh
-  include/sta/util/Vector.hh
-  include/sta/util/Zlib.hh
+  include/sta/ArrayTable.hh
+  include/sta/Debug.hh
+  include/sta/DispatchQueue.hh
+  include/sta/DisallowCopyAssign.hh
+  include/sta/EnumNameMap.hh
+  include/sta/Error.hh
+  include/sta/Fuzzy.hh
+  include/sta/Hash.hh
+  include/sta/HashSet.hh
+  include/sta/Iterator.hh
+  include/sta/Map.hh
+  include/sta/MinMax.hh
+  include/sta/Mutex.hh
+  include/sta/ObjectId.hh
+  include/sta/ObjectTable.hh
+  include/sta/PatternMatch.hh
+  include/sta/Report.hh
+  include/sta/ReportStd.hh
+  include/sta/ReportTcl.hh
+  include/sta/Set.hh
+  include/sta/Stats.hh
+  include/sta/StaConfig.hh
+  include/sta/StringSeq.hh
+  include/sta/StringSet.hh
+  include/sta/StringUtil.hh
+  include/sta/TokenParser.hh
+  include/sta/UnorderedMap.hh
+  include/sta/UnorderedSet.hh
+  include/sta/Vector.hh
+  include/sta/Zlib.hh
   )
 
 # Source files.
@@ -586,9 +589,9 @@ if("${SSTA}" STREQUAL "")
 endif()
 message(STATUS "SSTA: ${SSTA}")
 
-# configure a header file to pass some of the CMake settins
+# configure a header file to pass some of the CMake settings
 configure_file(${STA_HOME}/util/StaConfig.hh.cmake
-  ${STA_HOME}/util/StaConfig.hh
+  ${STA_HOME}/include/sta/StaConfig.hh
   )
 
 ################################################################

app/Main.cc

@@ -14,14 +14,14 @@
 // 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 "app/StaMain.hh"
+#include "StaMain.hh"
 
 #include <stdio.h>
 #include <tcl.h>
 
-#include "util/StaConfig.hh"  // STA_VERSION
-#include "util/StringUtil.hh"
-#include "search/Sta.hh"
+#include "StaConfig.hh"  // STA_VERSION
+#include "StringUtil.hh"
+#include "Sta.hh"
 
 
 namespace sta {

app/StaMain.cc

@@ -14,14 +14,15 @@
 // 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 "app/StaMain.hh"
+#include "StaMain.hh"
 
 #include <tcl.h>
 #include <stdlib.h>
 
-#include "util/StringUtil.hh"
-#include "util/Vector.hh"
-#include "search/Sta.hh"
+#include "util/Machine.hh"
+#include "StringUtil.hh"
+#include "Vector.hh"
+#include "Sta.hh"
 
 namespace sta {
 
@@ -106,7 +107,7 @@ evalTclInit(Tcl_Interp *interp,
     Tcl_Eval(interp, "$errorInfo");
     const char *tcl_err = Tcl_GetStringResult(interp);
     fprintf(stderr, "Error: TCL init script: %s.\n", tcl_err);
-    fprintf(stderr, "       Try deleting app/TclInitVar.cc and rebuilding.\n");
+    fprintf(stderr, "       Try deleting TclInitVar.cc and rebuilding.\n");
     exit(0);
   }
   delete [] unencoded;

dcalc/ArcDelayCalc.cc

@@ -14,11 +14,11 @@
 // 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 "dcalc/ArcDelayCalc.hh"
+#include "ArcDelayCalc.hh"
 
-#include "liberty/TimingModel.hh"
-#include "liberty/TimingArc.hh"
-#include "dcalc/GraphDelayCalc.hh"
+#include "TimingModel.hh"
+#include "TimingArc.hh"
+#include "GraphDelayCalc.hh"
 
 namespace sta {
 

dcalc/ArnoldiDelayCalc.cc

@@ -23,24 +23,24 @@
 #include <stdio.h>
 #include <cmath> // abs
 
-#include "util/Report.hh"
-#include "util/Debug.hh"
-#include "liberty/Units.hh"
-#include "liberty/Liberty.hh"
-#include "liberty/TimingModel.hh"
-#include "liberty/TimingArc.hh"
-#include "liberty/TableModel.hh"
-#include "network/Network.hh"
-#include "graph/Graph.hh"
-#include "parasitics/Parasitics.hh"
-#include "sdc/Sdc.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
-#include "dcalc/DelayCalc.hh"
-#include "dcalc/ArcDelayCalc.hh"
-#include "dcalc/RCDelayCalc.hh"
-#include "dcalc/GraphDelayCalc.hh"
-#include "dcalc/Arnoldi.hh"
-#include "dcalc/ArnoldiReduce.hh"
+#include "Report.hh"
+#include "Debug.hh"
+#include "Units.hh"
+#include "Liberty.hh"
+#include "TimingModel.hh"
+#include "TimingArc.hh"
+#include "TableModel.hh"
+#include "Network.hh"
+#include "Graph.hh"
+#include "Parasitics.hh"
+#include "Sdc.hh"
+#include "DcalcAnalysisPt.hh"
+#include "DelayCalc.hh"
+#include "ArcDelayCalc.hh"
+#include "RCDelayCalc.hh"
+#include "GraphDelayCalc.hh"
+#include "Arnoldi.hh"
+#include "ArnoldiReduce.hh"
 
 namespace sta {
 

dcalc/ArnoldiReduce.cc

@@ -25,12 +25,12 @@
 #include <ctype.h>
 #include <math.h>
 
-#include "util/Debug.hh"
-#include "util/MinMax.hh"
-#include "sdc/Sdc.hh"
-#include "network/Network.hh"
-#include "liberty/Units.hh"
-#include "dcalc/Arnoldi.hh"
+#include "Debug.hh"
+#include "MinMax.hh"
+#include "Sdc.hh"
+#include "Network.hh"
+#include "Units.hh"
+#include "Arnoldi.hh"
 #include "parasitics/ConcreteParasiticsPvt.hh"
 
 namespace sta {

dcalc/ArnoldiReduce.hh

@@ -20,12 +20,12 @@
 
 #pragma once
 
-#include "util/Map.hh"
-#include "liberty/Transition.hh"
-#include "network/NetworkClass.hh"
-#include "parasitics/ParasiticsClass.hh"
-#include "sdc/SdcClass.hh"
-#include "search/StaState.hh"
+#include "Map.hh"
+#include "Transition.hh"
+#include "NetworkClass.hh"
+#include "ParasiticsClass.hh"
+#include "SdcClass.hh"
+#include "StaState.hh"
 
 namespace sta {
 

dcalc/DcalcAnalysisPt.cc

@@ -14,9 +14,9 @@
 // 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 "util/StringUtil.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
-#include "search/Corner.hh"
+#include "StringUtil.hh"
+#include "DcalcAnalysisPt.hh"
+#include "Corner.hh"
 
 namespace sta {
 

dcalc/DelayCalc.cc

@@ -14,15 +14,15 @@
 // 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 "dcalc/DelayCalc.hh"
+#include "DelayCalc.hh"
 
-#include "util/Map.hh"
-#include "util/StringUtil.hh"
-#include "dcalc/UnitDelayCalc.hh"
-#include "dcalc/LumpedCapDelayCalc.hh"
-#include "dcalc/SimpleRCDelayCalc.hh"
-#include "dcalc/DmpDelayCalc.hh"
-#include "dcalc/ArnoldiDelayCalc.hh"
+#include "Map.hh"
+#include "StringUtil.hh"
+#include "UnitDelayCalc.hh"
+#include "LumpedCapDelayCalc.hh"
+#include "SimpleRCDelayCalc.hh"
+#include "DmpDelayCalc.hh"
+#include "ArnoldiDelayCalc.hh"
 
 namespace sta {
 

dcalc/DelayCalc.i

@@ -18,7 +18,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 "search/Sta.hh"
+#include "Sta.hh"
 
 %}
 

dcalc/DmpCeff.cc

@@ -22,22 +22,22 @@
 // The only real change from the paper is that Vl, the measured low
 // slew voltage is matched instead of y20 in eqn 12.
 
-#include "dcalc/DmpCeff.hh"
+#include "DmpCeff.hh"
 
 #include <algorithm> // abs, min
 #include <math.h>    // sqrt
 
-#include "util/Report.hh"
-#include "util/Debug.hh"
-#include "liberty/Units.hh"
-#include "liberty/TimingArc.hh"
-#include "liberty/TableModel.hh"
-#include "liberty/Liberty.hh"
-#include "network/Network.hh"
-#include "sdc/Sdc.hh"
-#include "parasitics/Parasitics.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
-#include "dcalc/ArcDelayCalc.hh"
+#include "Report.hh"
+#include "Debug.hh"
+#include "Units.hh"
+#include "TimingArc.hh"
+#include "TableModel.hh"
+#include "Liberty.hh"
+#include "Network.hh"
+#include "Sdc.hh"
+#include "Parasitics.hh"
+#include "DcalcAnalysisPt.hh"
+#include "ArcDelayCalc.hh"
 
 namespace sta {
 

dcalc/DmpCeff.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "liberty/LibertyClass.hh"
-#include "dcalc/RCDelayCalc.hh"
+#include "LibertyClass.hh"
+#include "RCDelayCalc.hh"
 
 namespace sta {
 

dcalc/DmpDelayCalc.cc

@@ -16,14 +16,14 @@
 
 #include "DmpDelayCalc.hh"
 
-#include "liberty/TableModel.hh"
-#include "liberty/TimingArc.hh"
-#include "liberty/Liberty.hh"
-#include "sdc/Sdc.hh"
-#include "parasitics/Parasitics.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
-#include "dcalc/GraphDelayCalc.hh"
-#include "dcalc/DmpCeff.hh"
+#include "TableModel.hh"
+#include "TimingArc.hh"
+#include "Liberty.hh"
+#include "Sdc.hh"
+#include "Parasitics.hh"
+#include "DcalcAnalysisPt.hh"
+#include "GraphDelayCalc.hh"
+#include "DmpCeff.hh"
 
 namespace sta {
 

dcalc/GraphDelayCalc.cc

@@ -14,13 +14,13 @@
 // 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 "dcalc/GraphDelayCalc.hh"
+#include "GraphDelayCalc.hh"
 
-#include "liberty/Liberty.hh"
-#include "network/Network.hh"
-#include "graph/Graph.hh"
-#include "sdc/Sdc.hh"
-#include "search/Corner.hh"
+#include "Liberty.hh"
+#include "Network.hh"
+#include "Graph.hh"
+#include "Sdc.hh"
+#include "Corner.hh"
 
 namespace sta {
 

dcalc/GraphDelayCalc1.cc

@@ -14,27 +14,27 @@
 // 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 "util/Debug.hh"
-#include "util/Stats.hh"
-#include "util/MinMax.hh"
-#include "util/Mutex.hh"
-#include "liberty/TimingRole.hh"
-#include "liberty/TimingArc.hh"
-#include "liberty/Liberty.hh"
-#include "network/PortDirection.hh"
-#include "network/Network.hh"
-#include "sdc/InputDrive.hh"
-#include "sdc/Sdc.hh"
-#include "graph/Graph.hh"
-#include "parasitics/Parasitics.hh"
+#include "Debug.hh"
+#include "Stats.hh"
+#include "MinMax.hh"
+#include "Mutex.hh"
+#include "TimingRole.hh"
+#include "TimingArc.hh"
+#include "Liberty.hh"
+#include "PortDirection.hh"
+#include "Network.hh"
+#include "InputDrive.hh"
+#include "Sdc.hh"
+#include "Graph.hh"
+#include "Parasitics.hh"
 #include "search/Levelize.hh"
-#include "search/Corner.hh"
-#include "search/SearchPred.hh"
-#include "search/Bfs.hh"
-#include "dcalc/ArcDelayCalc.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
-#include "dcalc/NetCaps.hh"
-#include "dcalc/GraphDelayCalc1.hh"
+#include "Corner.hh"
+#include "SearchPred.hh"
+#include "Bfs.hh"
+#include "ArcDelayCalc.hh"
+#include "DcalcAnalysisPt.hh"
+#include "NetCaps.hh"
+#include "GraphDelayCalc1.hh"
 
 namespace sta {
 

dcalc/GraphDelayCalc1.hh

@@ -18,7 +18,7 @@
 
 #include <mutex>
 
-#include "dcalc/GraphDelayCalc.hh"
+#include "GraphDelayCalc.hh"
 
 namespace sta {
 

dcalc/LumpedCapDelayCalc.cc

@@ -14,18 +14,18 @@
 // 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 "dcalc/LumpedCapDelayCalc.hh"
+#include "LumpedCapDelayCalc.hh"
 
-#include "util/Debug.hh"
-#include "liberty/Units.hh"
-#include "liberty/TimingArc.hh"
-#include "liberty/TimingModel.hh"
-#include "liberty/Liberty.hh"
-#include "network/Network.hh"
-#include "sdc/Sdc.hh"
-#include "parasitics/Parasitics.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
-#include "dcalc/GraphDelayCalc.hh"
+#include "Debug.hh"
+#include "Units.hh"
+#include "TimingArc.hh"
+#include "TimingModel.hh"
+#include "Liberty.hh"
+#include "Network.hh"
+#include "Sdc.hh"
+#include "Parasitics.hh"
+#include "DcalcAnalysisPt.hh"
+#include "GraphDelayCalc.hh"
 
 namespace sta {
 

dcalc/LumpedCapDelayCalc.hh

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "dcalc/ArcDelayCalc.hh"
+#include "ArcDelayCalc.hh"
 
 namespace sta {
 

dcalc/NetCaps.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 "dcalc/NetCaps.hh"
+#include "NetCaps.hh"
 
 namespace sta {
 

dcalc/NetCaps.hh

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
+#include "DisallowCopyAssign.hh"
 
 namespace sta {
 

dcalc/RCDelayCalc.cc

@@ -14,13 +14,13 @@
 // 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 "dcalc/RCDelayCalc.hh"
+#include "RCDelayCalc.hh"
 
-#include "liberty/Liberty.hh"
-#include "network/Network.hh"
-#include "sdc/Sdc.hh"
-#include "parasitics/Parasitics.hh"
-#include "dcalc/GraphDelayCalc.hh"
+#include "Liberty.hh"
+#include "Network.hh"
+#include "Sdc.hh"
+#include "Parasitics.hh"
+#include "GraphDelayCalc.hh"
 
 namespace sta {
 

dcalc/SimpleRCDelayCalc.cc

@@ -14,14 +14,14 @@
 // 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 "dcalc/SimpleRCDelayCalc.hh"
+#include "SimpleRCDelayCalc.hh"
 
-#include "liberty/TimingArc.hh"
-#include "liberty/Liberty.hh"
-#include "network/Network.hh"
-#include "sdc/Sdc.hh"
-#include "parasitics/Parasitics.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
+#include "TimingArc.hh"
+#include "Liberty.hh"
+#include "Network.hh"
+#include "Sdc.hh"
+#include "Parasitics.hh"
+#include "DcalcAnalysisPt.hh"
 
 namespace sta {
 

dcalc/UnitDelayCalc.cc

@@ -14,9 +14,9 @@
 // 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 "dcalc/UnitDelayCalc.hh"
+#include "UnitDelayCalc.hh"
 
-#include "liberty/Units.hh"
+#include "Units.hh"
 
 namespace sta {
 

dcalc/UnitDelayCalc.hh

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "dcalc/ArcDelayCalc.hh"
+#include "ArcDelayCalc.hh"
 
 namespace sta {
 

graph/DelayFloat.cc

@@ -14,12 +14,12 @@
 // 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 "graph/Delay.hh"
+#include "Delay.hh"
 
-#include "util/StaConfig.hh"
-#include "util/Fuzzy.hh"
-#include "liberty/Units.hh"
-#include "search/StaState.hh"
+#include "StaConfig.hh"
+#include "Fuzzy.hh"
+#include "Units.hh"
+#include "StaState.hh"
 
 // Non-SSTA compilation.
 #if !SSTA

graph/DelayNormal1.cc

@@ -14,16 +14,16 @@
 // 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 "graph/Delay.hh"
+#include "Delay.hh"
 
 #include <cmath> // sqrt
 
-#include "util/StaConfig.hh"
-#include "util/Error.hh"
-#include "util/StringUtil.hh"
-#include "util/Fuzzy.hh"
-#include "liberty/Units.hh"
-#include "search/StaState.hh"
+#include "StaConfig.hh"
+#include "Error.hh"
+#include "StringUtil.hh"
+#include "Fuzzy.hh"
+#include "Units.hh"
+#include "StaState.hh"
 
 // SSTA compilation.
 #if (SSTA == 1)

graph/DelayNormal2.cc

@@ -14,16 +14,16 @@
 // 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 "graph/Delay.hh"
+#include "Delay.hh"
 
 #include <cmath> // sqrt
 
-#include "util/StaConfig.hh"
-#include "util/Error.hh"
-#include "util/StringUtil.hh"
-#include "util/Fuzzy.hh"
-#include "liberty/Units.hh"
-#include "search/StaState.hh"
+#include "StaConfig.hh"
+#include "Error.hh"
+#include "StringUtil.hh"
+#include "Fuzzy.hh"
+#include "Units.hh"
+#include "StaState.hh"
 
 // SSTA compilation.
 #if (SSTA == 2)

graph/Graph.cc

@@ -14,21 +14,21 @@
 // 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 "graph/Graph.hh"
+#include "Graph.hh"
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Stats.hh"
-#include "util/Error.hh"
-#include "util/Debug.hh"
-#include "util/MinMax.hh"
-#include "util/Mutex.hh"
-#include "liberty/Transition.hh"
-#include "liberty/TimingRole.hh"
-#include "liberty/TimingArc.hh"
-#include "liberty/Liberty.hh"
-#include "network/PortDirection.hh"
-#include "network/Network.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
+#include "DisallowCopyAssign.hh"
+#include "Stats.hh"
+#include "Error.hh"
+#include "Debug.hh"
+#include "MinMax.hh"
+#include "Mutex.hh"
+#include "Transition.hh"
+#include "TimingRole.hh"
+#include "TimingArc.hh"
+#include "Liberty.hh"
+#include "PortDirection.hh"
+#include "Network.hh"
+#include "DcalcAnalysisPt.hh"
 
 namespace sta {
 

graph/GraphCmp.cc

@@ -14,11 +14,11 @@
 // 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 "util/StringUtil.hh"
-#include "network/Network.hh"
-#include "network/NetworkCmp.hh"
-#include "graph/Graph.hh"
-#include "graph/GraphCmp.hh"
+#include "StringUtil.hh"
+#include "Network.hh"
+#include "NetworkCmp.hh"
+#include "Graph.hh"
+#include "GraphCmp.hh"
 
 namespace sta {
 

include/sta/ArcDelayCalc.hh

@@ -17,12 +17,12 @@
 #pragma once
 
 #include <string>
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "liberty/LibertyClass.hh"
-#include "network/NetworkClass.hh"
-#include "graph/Delay.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "LibertyClass.hh"
+#include "NetworkClass.hh"
+#include "Delay.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/Bfs.hh

@@ -18,12 +18,12 @@
 
 #include <mutex>
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Iterator.hh"
-#include "util/Set.hh"
-#include "graph/GraphClass.hh"
-#include "search/VertexVisitor.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "Iterator.hh"
+#include "Set.hh"
+#include "GraphClass.hh"
+#include "VertexVisitor.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/ClkInfo.hh

@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "liberty/Transition.hh"
-#include "search/SearchClass.hh"
-#include "search/PathVertexRep.hh"
+#include "DisallowCopyAssign.hh"
+#include "Transition.hh"
+#include "SearchClass.hh"
+#include "PathVertexRep.hh"
 
 namespace sta {
 

include/sta/Clock.hh

@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "sdc/RiseFallMinMax.hh"
-#include "sdc/SdcClass.hh"
-#include "sdc/SdcCmdComment.hh"
-#include "graph/GraphClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "RiseFallMinMax.hh"
+#include "SdcClass.hh"
+#include "SdcCmdComment.hh"
+#include "GraphClass.hh"
 
 namespace sta {
 

include/sta/ClockGatingCheck.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "sdc/SdcClass.hh"
-#include "sdc/RiseFallMinMax.hh"
+#include "DisallowCopyAssign.hh"
+#include "SdcClass.hh"
+#include "RiseFallMinMax.hh"
 
 namespace sta {
 

include/sta/ClockGroups.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "sdc/SdcCmdComment.hh"
-#include "sdc/SdcClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "SdcCmdComment.hh"
+#include "SdcClass.hh"
 
 namespace sta {
 

include/sta/ClockInsertion.hh

@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "network/NetworkClass.hh"
-#include "sdc/SdcClass.hh"
-#include "sdc/RiseFallMinMax.hh"
-#include "liberty/Transition.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "NetworkClass.hh"
+#include "SdcClass.hh"
+#include "RiseFallMinMax.hh"
+#include "Transition.hh"
 
 namespace sta {
 

include/sta/ClockLatency.hh

@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "network/NetworkClass.hh"
-#include "liberty/Transition.hh"
-#include "sdc/SdcClass.hh"
-#include "sdc/RiseFallMinMax.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "NetworkClass.hh"
+#include "Transition.hh"
+#include "SdcClass.hh"
+#include "RiseFallMinMax.hh"
 
 namespace sta {
 

include/sta/ConcreteLibrary.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Vector.hh"
-#include "util/Map.hh"
-#include "util/StringUtil.hh"
-#include "network/NetworkClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Vector.hh"
+#include "Map.hh"
+#include "StringUtil.hh"
+#include "NetworkClass.hh"
 
 // The classes defined in this file are a contrete implementation of
 // the library API.  They can be used by a reader to construct classes

include/sta/ConcreteNetwork.hh

@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Map.hh"
-#include "util/Set.hh"
-#include "util/StringUtil.hh"
-#include "network/Network.hh"
-#include "liberty/LibertyClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Map.hh"
+#include "Set.hh"
+#include "StringUtil.hh"
+#include "Network.hh"
+#include "LibertyClass.hh"
 
 namespace  sta {
 

include/sta/Corner.hh

@@ -16,13 +16,13 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "util/Vector.hh"
-#include "util/StringSet.hh"
-#include "graph/GraphClass.hh"
-#include "search/SearchClass.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "Vector.hh"
+#include "StringSet.hh"
+#include "GraphClass.hh"
+#include "SearchClass.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/CycleAccting.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "liberty/TimingRole.hh"
-#include "search/StaState.hh"
-#include "sdc/SdcClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "TimingRole.hh"
+#include "StaState.hh"
+#include "SdcClass.hh"
 
 namespace sta {
 

include/sta/DataCheck.hh

@@ -16,13 +16,13 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "liberty/LibertyClass.hh"
-#include "network/NetworkClass.hh"
-#include "network/NetworkCmp.hh"
-#include "sdc/SdcClass.hh"
-#include "sdc/RiseFallMinMax.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "LibertyClass.hh"
+#include "NetworkClass.hh"
+#include "NetworkCmp.hh"
+#include "SdcClass.hh"
+#include "RiseFallMinMax.hh"
 
 namespace sta {
 

include/sta/DcalcAnalysisPt.hh

@@ -16,14 +16,14 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Iterator.hh"
-#include "util/MinMax.hh"
-#include "liberty/LibertyClass.hh"
-#include "sdc/SdcClass.hh"
-#include "parasitics/ParasiticsClass.hh"
-#include "graph/GraphClass.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "Iterator.hh"
+#include "MinMax.hh"
+#include "LibertyClass.hh"
+#include "SdcClass.hh"
+#include "ParasiticsClass.hh"
+#include "GraphClass.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/Delay.hh

@@ -14,19 +14,19 @@
 // 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 "util/StaConfig.hh"
+#include "StaConfig.hh"
 
 #pragma once
 
 #if (SSTA == 1)
   // Delays are Normal PDFs.
-  #include "graph/DelayNormal1.hh"
+  #include "DelayNormal1.hh"
 #elif (SSTA == 2)
   // Delays are Normal PDFs with early/late sigma.
-  #include "graph/DelayNormal2.hh"
+  #include "DelayNormal2.hh"
 #else
   // Delays are floats.
-  #include "graph/DelayFloat.hh"
+  #include "DelayFloat.hh"
 #endif
 
 namespace sta {

include/sta/DelayCalc.hh

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "util/StringSeq.hh"
+#include "StringSeq.hh"
 
 namespace sta {
 

include/sta/DelayFloat.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/MinMax.hh"
-#include "util/Fuzzy.hh"
+#include "MinMax.hh"
+#include "Fuzzy.hh"
 
 // Delay values defined as floats.
 

include/sta/DelayNormal1.hh

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "util/MinMax.hh"
+#include "MinMax.hh"
 
 namespace sta {
 

include/sta/DelayNormal2.hh

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "util/MinMax.hh"
+#include "MinMax.hh"
 
 namespace sta {
 

include/sta/DeratingFactors.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "liberty/LibertyClass.hh"
-#include "sdc/SdcClass.hh"
-#include "sdc/RiseFallMinMax.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "LibertyClass.hh"
+#include "SdcClass.hh"
+#include "RiseFallMinMax.hh"
 
 namespace sta {
 

include/sta/DisabledPorts.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Map.hh"
-#include "network/NetworkClass.hh"
-#include "liberty/LibertyClass.hh"
-#include "sdc/SdcClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Map.hh"
+#include "NetworkClass.hh"
+#include "LibertyClass.hh"
+#include "SdcClass.hh"
 
 namespace sta {
 

include/sta/EquivCells.hh

@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "util/Vector.hh"
-#include "util/Map.hh"
-#include "util/UnorderedMap.hh"
-#include "liberty/LibertyClass.hh"
+#include "Vector.hh"
+#include "Map.hh"
+#include "UnorderedMap.hh"
+#include "LibertyClass.hh"
 
 namespace sta {
 

include/sta/ExceptionPath.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Error.hh"
-#include "util/Set.hh"
-#include "sdc/SdcCmdComment.hh"
-#include "sdc/SdcClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Error.hh"
+#include "Set.hh"
+#include "SdcCmdComment.hh"
+#include "SdcClass.hh"
 
 namespace sta {
 

include/sta/FuncExpr.hh

@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Set.hh"
-#include "network/NetworkClass.hh"
-#include "liberty/LibertyClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Set.hh"
+#include "NetworkClass.hh"
+#include "LibertyClass.hh"
 
 namespace sta {
 

include/sta/Graph.hh

@@ -18,25 +18,24 @@
 
 #include <mutex>
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Iterator.hh"
-#include "util/Map.hh"
-#include "util/Vector.hh"
-#include "util/ObjectTable.hh"
-#include "util/ArrayTable.hh"
-#include "liberty/LibertyClass.hh"
-#include "network/NetworkClass.hh"
-#include "graph/Delay.hh"
-#include "graph/GraphClass.hh"
-#include "graph/VertexId.hh"
-#include "search/PathVertexRep.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "Iterator.hh"
+#include "Map.hh"
+#include "Vector.hh"
+#include "ObjectTable.hh"
+#include "ArrayTable.hh"
+#include "LibertyClass.hh"
+#include "NetworkClass.hh"
+#include "Delay.hh"
+#include "GraphClass.hh"
+#include "VertexId.hh"
+#include "PathVertexRep.hh"
+#include "StaState.hh"
 
 namespace sta {
 
 class MinMax;
 class Sdc;
-class PathVertexRep;
 
 enum class LevelColor { white, gray, black };
 

include/sta/GraphClass.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/ObjectId.hh"
-#include "util/Set.hh"
-#include "util/Vector.hh"
-#include "util/MinMax.hh"
-#include "liberty/Transition.hh"
+#include "ObjectId.hh"
+#include "Set.hh"
+#include "Vector.hh"
+#include "MinMax.hh"
+#include "Transition.hh"
 
 namespace sta {
 

include/sta/GraphCmp.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "network/NetworkClass.hh"
-#include "network/NetworkCmp.hh"
-#include "graph/GraphClass.hh"
+#include "NetworkClass.hh"
+#include "NetworkCmp.hh"
+#include "GraphClass.hh"
 
 namespace sta {
 

include/sta/GraphDelayCalc.hh

@@ -17,10 +17,10 @@
 #pragma once
 
 #include <string>
-#include "util/DisallowCopyAssign.hh"
-#include "graph/GraphClass.hh"
-#include "dcalc/DcalcAnalysisPt.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "GraphClass.hh"
+#include "DcalcAnalysisPt.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/HpinDrvrLoad.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Set.hh"
-#include "network/NetworkClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Set.hh"
+#include "NetworkClass.hh"
 
 namespace sta {
 

include/sta/InputDrive.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "liberty/LibertyClass.hh"
-#include "network/NetworkClass.hh"
-#include "sdc/RiseFallMinMax.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "LibertyClass.hh"
+#include "NetworkClass.hh"
+#include "RiseFallMinMax.hh"
 
 namespace sta {
 

include/sta/InternalPower.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "liberty/LibertyClass.hh"
-#include "liberty/Transition.hh"
+#include "DisallowCopyAssign.hh"
+#include "LibertyClass.hh"
+#include "Transition.hh"
 
 namespace sta {
 

include/sta/LeakagePower.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "liberty/LibertyClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "LibertyClass.hh"
 
 namespace sta {
 

include/sta/Liberty.hh

@@ -16,14 +16,14 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "sdc/RiseFallMinMax.hh"
-#include "network/ConcreteLibrary.hh"
-#include "sdc/RiseFallValues.hh"
-#include "sdc/MinMaxValues.hh"
-#include "liberty/Transition.hh"
-#include "liberty/LibertyClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "RiseFallMinMax.hh"
+#include "ConcreteLibrary.hh"
+#include "RiseFallValues.hh"
+#include "MinMaxValues.hh"
+#include "Transition.hh"
+#include "LibertyClass.hh"
 
 namespace sta {
 

include/sta/LibertyClass.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/Vector.hh"
-#include "util/Map.hh"
-#include "util/Set.hh"
+#include "Vector.hh"
+#include "Map.hh"
+#include "Set.hh"
 
 namespace sta {
 

include/sta/LinearModel.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "liberty/TimingModel.hh"
+#include "DisallowCopyAssign.hh"
+#include "TimingModel.hh"
 
 namespace sta {
 

include/sta/MinMaxValues.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/MinMax.hh"
-#include "util/Error.hh"
+#include "MinMax.hh"
+#include "Error.hh"
 
 namespace sta {
 

include/sta/Network.hh

@@ -16,13 +16,13 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Map.hh"
-#include "util/StringUtil.hh"
-#include "liberty/LibertyClass.hh"
-#include "graph/VertexId.hh"
-#include "network/NetworkClass.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "Map.hh"
+#include "StringUtil.hh"
+#include "LibertyClass.hh"
+#include "VertexId.hh"
+#include "NetworkClass.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/NetworkClass.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/Set.hh"
-#include "util/Vector.hh"
-#include "util/Iterator.hh"
+#include "Set.hh"
+#include "Vector.hh"
+#include "Iterator.hh"
 
 namespace sta {
 

include/sta/NetworkCmp.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "liberty/LibertyClass.hh"
-#include "network/NetworkClass.hh"
+#include "LibertyClass.hh"
+#include "NetworkClass.hh"
 
 namespace sta {
 

include/sta/NullParasitics.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "parasitics/Parasitics.hh"
+#include "DisallowCopyAssign.hh"
+#include "Parasitics.hh"
 
 namespace sta {
 

include/sta/Parasitics.hh

@@ -17,12 +17,12 @@
 #pragma once
 
 #include <complex>
-#include "util/DisallowCopyAssign.hh"
-#include "search/StaState.hh"
-#include "liberty/LibertyClass.hh"
-#include "network/NetworkClass.hh"
-#include "sdc/SdcClass.hh"
-#include "parasitics/ParasiticsClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "StaState.hh"
+#include "LibertyClass.hh"
+#include "NetworkClass.hh"
+#include "SdcClass.hh"
+#include "ParasiticsClass.hh"
 
 namespace sta {
 

include/sta/Path.hh

@@ -16,15 +16,15 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/MinMax.hh"
-#include "network/NetworkClass.hh"
-#include "sdc/SdcClass.hh"
-#include "liberty/Transition.hh"
-#include "graph/GraphClass.hh"
-#include "graph/Delay.hh"
-#include "search/StaState.hh"
-#include "search/SearchClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "MinMax.hh"
+#include "NetworkClass.hh"
+#include "SdcClass.hh"
+#include "Transition.hh"
+#include "GraphClass.hh"
+#include "Delay.hh"
+#include "StaState.hh"
+#include "SearchClass.hh"
 
 namespace sta {
 

include/sta/PathAnalysisPt.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Iterator.hh"
-#include "util/MinMax.hh"
-#include "sdc/SdcClass.hh"
-#include "search/SearchClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Iterator.hh"
+#include "MinMax.hh"
+#include "SdcClass.hh"
+#include "SearchClass.hh"
 
 namespace sta {
 

include/sta/PathEnd.hh

@@ -18,14 +18,13 @@
 
 #include <string>
 
-#include "util/DisallowCopyAssign.hh"
-#include "liberty/LibertyClass.hh"
-#include "graph/GraphClass.hh"
-#include "sdc/SdcClass.hh"
-#include "search/SearchClass.hh"
-#include "search/PathRef.hh"
-#include "search/Crpr.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "LibertyClass.hh"
+#include "GraphClass.hh"
+#include "SdcClass.hh"
+#include "SearchClass.hh"
+#include "PathRef.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/PathExpanded.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "liberty/TimingArc.hh"
-#include "graph/GraphClass.hh"
-#include "search/SearchClass.hh"
-#include "search/StaState.hh"
+#include "DisallowCopyAssign.hh"
+#include "TimingArc.hh"
+#include "GraphClass.hh"
+#include "SearchClass.hh"
+#include "StaState.hh"
 
 namespace sta {
 

include/sta/PathGroup.hh

@@ -18,12 +18,12 @@
 
 #include <mutex>
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Map.hh"
-#include "util/Vector.hh"
-#include "sdc/SdcClass.hh"
-#include "search/StaState.hh"
-#include "search/SearchClass.hh"
+#include "DisallowCopyAssign.hh"
+#include "Map.hh"
+#include "Vector.hh"
+#include "SdcClass.hh"
+#include "StaState.hh"
+#include "SearchClass.hh"
 
 namespace sta {
 

include/sta/PathRef.hh

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "util/Vector.hh"
-#include "search/SearchClass.hh"
-#include "search/Path.hh"
-#include "search/PathVertex.hh"
+#include "DisallowCopyAssign.hh"
+#include "Vector.hh"
+#include "SearchClass.hh"
+#include "Path.hh"
+#include "PathVertex.hh"
 
 namespace sta {
 

include/sta/PathVertex.hh

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/DisallowCopyAssign.hh"
-#include "search/SearchClass.hh"
-#include "search/Path.hh"
+#include "DisallowCopyAssign.hh"
+#include "SearchClass.hh"
+#include "Path.hh"
 
 namespace sta {
 

include/sta/PathVertexRep.hh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "sdc/SdcClass.hh"
-#include "search/SearchClass.hh"
+#include "SdcClass.hh"
+#include "SearchClass.hh"
 
 namespace sta {