1 files changed, 9 insertions, 7 deletions
diff --git a/fpga_interchange/arch.h b/fpga_interchange/arch.h
index 16c79e8a..a171ba55 100644
--- a/fpga_interchange/arch.h
+++ b/fpga_interchange/arch.h
@@ -20,16 +20,18 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "arch.h" via "nextpnr.h" only.
-#endif
+#ifndef FPGA_INTERCHANGE_ARCH_H
+#define FPGA_INTERCHANGE_ARCH_H
 
 #include <boost/iostreams/device/mapped_file.hpp>
-
 #include <iostream>
-
 #include <regex>
+
+#include "arch_api.h"
 #include "constraints.h"
+#include "nextpnr_types.h"
+#include "relptr.h"
+
 #include "dedicated_interconnect.h"
 #include "site_router.h"
 
@@ -37,8 +39,6 @@ NEXTPNR_NAMESPACE_BEGIN
 
 /**** Everything in this section must be kept in sync with chipdb.py ****/
 
-#include "relptr.h"
-
 // Flattened site indexing.
 //
 // To enable flat BelId.z spaces, every tile and sites within that tile are
@@ -1742,3 +1742,5 @@ struct Arch : ArchAPI<ArchRanges>
 };
 
 NEXTPNR_NAMESPACE_END
+
+#endif /* FPGA_INTERCHANGE_ARCH_H */