Merge pull request #621 from litghost/fix_header_nightmare

Split nextpnr.h to allow for linear inclusion.

5 files changed, 42 insertions, 25 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 */
diff --git a/fpga_interchange/archdefs.h b/fpga_interchange/archdefs.h
index e355a6c4..c9c0bc4f 100644
--- a/fpga_interchange/archdefs.h
+++ b/fpga_interchange/archdefs.h
@@ -18,16 +18,17 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "archdefs.h" via "nextpnr.h" only.
-#endif
+#ifndef FPGA_INTERCHANGE_ARCHDEFS_H
+#define FPGA_INTERCHANGE_ARCHDEFS_H
+
+#include <boost/functional/hash.hpp>
+#include <cstdint>
 
 #include "luts.h"
+#include "nextpnr_namespaces.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
-#include <cstdint>
-
 typedef int delay_t;
 
 // -----------------------------------------------------------------------
@@ -177,3 +178,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX BelBucketId>
 };
 
 } // namespace std
+
+#endif /* FPGA_INTERCHANGE_ARCHDEFS_H */
diff --git a/fpga_interchange/dedicated_interconnect.h b/fpga_interchange/dedicated_interconnect.h
index 66e1d41b..41adea15 100644
--- a/fpga_interchange/dedicated_interconnect.h
+++ b/fpga_interchange/dedicated_interconnect.h
@@ -18,9 +18,16 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "dedicated_interconnect.h" via "nextpnr.h" only.
-#endif
+#ifndef DEDICATED_INTERCONNECT_H
+#define DEDICATED_INTERCONNECT_H
+
+#include <boost/functional/hash.hpp>
+#include <cstdint>
+#include <unordered_map>
+
+#include "archdefs.h"
+#include "idstring.h"
+#include "nextpnr_namespaces.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
@@ -138,3 +145,5 @@ struct DedicatedInterconnect
 };
 
 NEXTPNR_NAMESPACE_END
+
+#endif /* DEDICATED_INTERCONNECT_H */
diff --git a/fpga_interchange/luts.h b/fpga_interchange/luts.h
index a5d3b1d0..333df36e 100644
--- a/fpga_interchange/luts.h
+++ b/fpga_interchange/luts.h
@@ -17,15 +17,17 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "luts.h" via "nextpnr.h" only.
-#endif
-
-#include "dynamic_bitarray.h"
-
 #ifndef LUTS_H
 #define LUTS_H
 
+#include <unordered_map>
+#include <unordered_set>
+
+#include "idstring.h"
+#include "nextpnr_namespaces.h"
+
+#include "dynamic_bitarray.h"
+
 NEXTPNR_NAMESPACE_BEGIN
 
 struct CellInfo;
diff --git a/fpga_interchange/site_router.h b/fpga_interchange/site_router.h
index 6af32747..c2590728 100644
--- a/fpga_interchange/site_router.h
+++ b/fpga_interchange/site_router.h
@@ -18,13 +18,14 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "site_router.h" via "nextpnr.h" only.
-#endif
-
 #ifndef SITE_ROUTER_H
 #define SITE_ROUTER_H
 
+#include <cstdint>
+
+#include "nextpnr_namespaces.h"
+#include "nextpnr_types.h"
+
 NEXTPNR_NAMESPACE_BEGIN
 
 struct Context;