1 files changed, 9 insertions, 5 deletions
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 */