2 files changed, 20 insertions, 6 deletions
diff --git a/generic/arch.h b/generic/arch.h
index cc8de484..1d37b2fd 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -17,9 +17,16 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "arch.h" via "nextpnr.h" only.
-#endif
+#ifndef GENERIC_ARCH_H
+#define GENERIC_ARCH_H
+
+#include <map>
+
+#include "arch_api.h"
+#include "idstring.h"
+#include "idstringlist.h"
+#include "nextpnr_namespaces.h"
+#include "nextpnr_types.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
@@ -366,3 +373,5 @@ struct Arch : ArchAPI<ArchRanges>
 };
 
 NEXTPNR_NAMESPACE_END
+
+#endif /* GENERIC_ARCH_H */
diff --git a/generic/archdefs.h b/generic/archdefs.h
index a5108e9e..bdd97dde 100644
--- a/generic/archdefs.h
+++ b/generic/archdefs.h
@@ -17,9 +17,12 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "archdefs.h" via "nextpnr.h" only.
-#endif
+#ifndef GENERIC_ARCHDEFS_H
+#define GENERIC_ARCHDEFS_H
+
+#include <unordered_map>
+
+#include "idstringlist.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
@@ -52,3 +55,5 @@ struct ArchCellInfo
 };
 
 NEXTPNR_NAMESPACE_END
+
+#endif /* GENERIC_ARCHDEFS_H */