3 files changed, 21 insertions, 10 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h
index f1da870a..063a3df6 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -18,19 +18,20 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "arch.h" via "nextpnr.h" only.
-#endif
+#ifndef ECP5_ARCH_H
+#define ECP5_ARCH_H
 
 #include <set>
 #include <sstream>
 
+#include "base_arch.h"
+#include "nextpnr_types.h"
+#include "relptr.h"
+
 NEXTPNR_NAMESPACE_BEGIN
 
 /**** Everything in this section must be kept in sync with chipdb.py ****/
 
-#include "relptr.h"
-
 NPNR_PACKED_STRUCT(struct BelWirePOD {
     LocationPOD rel_wire_loc;
     int32_t wire_index;
@@ -928,3 +929,5 @@ struct Arch : BaseArch<ArchRanges>
 };
 
 NEXTPNR_NAMESPACE_END
+
+#endif /* ECP5_ARCH_H */
diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h
index cf6902d3..6a149264 100644
--- a/ecp5/archdefs.h
+++ b/ecp5/archdefs.h
@@ -18,12 +18,14 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "archdefs.h" via "nextpnr.h" only.
-#endif
+#ifndef ECP5_ARCHDEFS_H
+#define ECP5_ARCHDEFS_H
 
 #include <boost/functional/hash.hpp>
 
+#include "idstring.h"
+#include "nextpnr_namespaces.h"
+
 NEXTPNR_NAMESPACE_BEGIN
 
 typedef int delay_t;
@@ -165,12 +167,12 @@ struct ArchCellInfo
         bool is_output_b_registered;
         // Which timing information to use for a DP16KD. Depends on registering
         // configuration.
-        nextpnr_ecp5::IdString regmode_timing_id;
+        IdString regmode_timing_id;
     } ramInfo;
     struct
     {
         bool is_clocked;
-        nextpnr_ecp5::IdString timing_id;
+        IdString timing_id;
     } multInfo;
 };
 
@@ -242,3 +244,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId>
 };
 
 } // namespace std
+
+#endif /* ECP5_ARCHDEFS_H */
diff --git a/ecp5/lpf.cc b/ecp5/lpf.cc
index 22859783..6d134e8d 100644
--- a/ecp5/lpf.cc
+++ b/ecp5/lpf.cc
@@ -19,7 +19,11 @@
 
 #include <boost/algorithm/string.hpp>
 #include <sstream>
+#include <unordered_set>
+
+#include "arch.h"
 #include "log.h"
+#include "nextpnr_namespaces.h"
 
 NEXTPNR_NAMESPACE_BEGIN