diff --git a/search/Latches.cc b/search/Latches.cc
index dec6bcf2..d47b16a1 100644
--- a/search/Latches.cc
+++ b/search/Latches.cc
@@ -14,6 +14,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 "Latches.hh"
+
 #include "Debug.hh"
 #include "TimingRole.hh"
 #include "TimingArc.hh"
@@ -30,8 +32,6 @@
 #include "Search.hh"
 #include "Crpr.hh"
 
-#include "Latches.hh"
-
 namespace sta {
 
 Latches::Latches(StaState *sta) :
diff --git a/search/Latches.hh b/search/Latches.hh
index 4674d219..277f8669 100644
--- a/search/Latches.hh
+++ b/search/Latches.hh
@@ -16,12 +16,13 @@
 
 #pragma once
 
-namespace sta {
-
 #include "GraphClass.hh"
 #include "SearchClass.hh"
+#include "SdcClass.hh"
 #include "StaState.hh"
 
+namespace sta {
+
 enum class LatchEnableState { enabled, open, closed };
 
 // Latches class defines latch behavior.
diff --git a/search/WorstSlack.cc b/search/WorstSlack.cc
index ebb8c6e2..bce83e93 100644
--- a/search/WorstSlack.cc
+++ b/search/WorstSlack.cc
@@ -14,6 +14,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 "WorstSlack.hh"
+
 #include "Debug.hh"
 #include "Report.hh"
 #include "Mutex.hh"
@@ -22,8 +24,6 @@
 #include "Search.hh"
 #include "PathAnalysisPt.hh"
 
-#include "WorstSlack.hh"
-
 namespace sta {
 
 using std::min;
diff --git a/search/WorstSlack.hh b/search/WorstSlack.hh
index 1bb3a87a..8b5cb6f7 100644
--- a/search/WorstSlack.hh
+++ b/search/WorstSlack.hh
@@ -16,8 +16,6 @@
 
 #pragma once
 
-namespace sta {
-
 #include <mutex>
 
 #include "MinMax.hh"
@@ -25,6 +23,8 @@ namespace sta {
 #include "GraphClass.hh"
 #include "SearchClass.hh"
 
+namespace sta {
+
 class StaState;
 class WorstSlack;
 class WnsSlackLess;