From 2bd6d9343c109de94da61adaa8b5228b2f3e544f Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Wed, 15 Jun 2022 13:56:47 +0200
Subject: [PATCH] Fixes for some of the header renames

---
 src/ifcgeom_schema_agnostic/Serialization.h |  3 ++-
 src/ifcgeomserver/IfcGeomServer.cpp         |  2 +-
 src/ifcwrap/IfcGeomWrapper.i                | 12 ++++++------
 src/ifcwrap/IfcPython.i                     |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/ifcgeom_schema_agnostic/Serialization.h b/src/ifcgeom_schema_agnostic/Serialization.h
index be3d79bd3f..5e7d4c82c6 100644
--- a/src/ifcgeom_schema_agnostic/Serialization.h
+++ b/src/ifcgeom_schema_agnostic/Serialization.h
@@ -1,6 +1,7 @@
-#include "../ifcgeom/ifc_geom_api.h"
 #include "../ifcparse/IfcBaseClass.h"
 
+#include "../ifcgeom_schema_agnostic/ifc_geom_api.h"
+
 #include <TopoDS_Shape.hxx>
 
 #include <string>
diff --git a/src/ifcgeomserver/IfcGeomServer.cpp b/src/ifcgeomserver/IfcGeomServer.cpp
index 7abc957b02..c30d04b8c8 100644
--- a/src/ifcgeomserver/IfcGeomServer.cpp
+++ b/src/ifcgeomserver/IfcGeomServer.cpp
@@ -39,7 +39,7 @@
 #endif
 
 #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
-#include "../ifcgeom/IfcGeomElement.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomElement.h"
 #include "../ifcparse/IfcFile.h"
 #include "../ifcparse/IfcLogger.h"
 
diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i
index 0889b465d5..ebc76c9350 100644
--- a/src/ifcwrap/IfcGeomWrapper.i
+++ b/src/ifcwrap/IfcGeomWrapper.i
@@ -58,14 +58,14 @@
 	}
 }
 
-%include "../ifcgeom/ifc_geom_api.h"
-%include "../ifcgeom/IfcGeomIteratorSettings.h"
-%include "../ifcgeom/IfcGeomElement.h"
+%include "../ifcgeom_schema_agnostic/ifc_geom_api.h"
+%include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h"
+%include "../ifcgeom_schema_agnostic/IfcGeomElement.h"
 %include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h"
-%include "../ifcgeom/IfcGeomRepresentation.h"
+%include "../ifcgeom_schema_agnostic/IfcGeomRepresentation.h"
 %include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
-
 %include "../ifcgeom_schema_agnostic/GeometrySerializer.h"
+
 %include "../serializers/SvgSerializer.h"
 %include "../serializers/HdfSerializer.h"
 %include "../serializers/WavefrontObjSerializer.h"
@@ -76,7 +76,7 @@
 
 // A Template instantantation should be defined before it is used as a base class. 
 // But frankly I don't care as most methods are subtlely different anyway.
-%include "../ifcgeom/IfcGeomTree.h"
+%include "../ifcgeom_schema_agnostic/IfcGeomTree.h"
 
 %extend IfcGeom::tree {
 
diff --git a/src/ifcwrap/IfcPython.i b/src/ifcwrap/IfcPython.i
index d14f968b61..dd1517c998 100644
--- a/src/ifcwrap/IfcPython.i
+++ b/src/ifcwrap/IfcPython.i
@@ -80,7 +80,7 @@
 %{
 	#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 	#include "../ifcgeom_schema_agnostic/Serialization.h"
-	#include "../ifcgeom/IfcGeomTree.h"
+	#include "../ifcgeom_schema_agnostic/IfcGeomTree.h"
 
 	#include "../serializers/SvgSerializer.h"
 	#include "../serializers/WavefrontObjSerializer.h"
@@ -133,7 +133,7 @@
 %module ifcopenshell_wrapper %{
 	#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 	#include "../ifcgeom_schema_agnostic/Serialization.h"
-	#include "../ifcgeom/IfcGeomTree.h"
+	#include "../ifcgeom_schema_agnostic/IfcGeomTree.h"
 
 	#include "../serializers/SvgSerializer.h"
 	#include "../serializers/WavefrontObjSerializer.h"