diff --git a/src/ifcgeom_schema_agnostic/IfcGeomIterator.h b/src/ifcgeom_schema_agnostic/IfcGeomIterator.h
index 3d86660cd8..8ab70b48e7 100644
--- a/src/ifcgeom_schema_agnostic/IfcGeomIterator.h
+++ b/src/ifcgeom_schema_agnostic/IfcGeomIterator.h
@@ -45,7 +45,7 @@
  *                                                                              *
  * IfcGeom::Iterator::get()                                                     *
  *   returns a pointer to the current IfcGeom::Element                          *
- *                                                                              * 
+ *                                                                              *
  * IfcGeom::Iterator::next()                                                    *
  *   returns true iff a following entity is available for a successive call to  *
  *   IfcGeom::Iterator::get()                                                   *
@@ -69,9 +69,9 @@
 #endif
 
 namespace IfcGeom {
-	
+
 	template <typename P = double, typename PP = P>
-	class Iterator {
+	class IFC_GEOM_API Iterator {
 	private:
 		Iterator(const Iterator&); // N/I
 		Iterator& operator=(const Iterator&); // N/I
diff --git a/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp b/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
index a664db0378..731881526f 100644
--- a/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
+++ b/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
@@ -8,9 +8,9 @@ IteratorFactoryImplementation<P, PP>& iterator_implementations() {
 	return impl;
 }
 
-template IteratorFactoryImplementation<float, float>& iterator_implementations<float, float>();
-template IteratorFactoryImplementation<float, double>& iterator_implementations<float, double>();
-template IteratorFactoryImplementation<double, double>& iterator_implementations<double, double>();
+template IFC_GEOM_API IteratorFactoryImplementation<float, float>& iterator_implementations<float, float>();
+template IFC_GEOM_API IteratorFactoryImplementation<float, double>& iterator_implementations<float, double>();
+template IFC_GEOM_API IteratorFactoryImplementation<double, double>& iterator_implementations<double, double>();
 
 #ifdef HAS_SCHEMA_2x3
 template <typename P, typename PP>
@@ -46,19 +46,19 @@ template <typename P, typename PP>
 IteratorFactoryImplementation<P, PP>::IteratorFactoryImplementation() {
 #ifdef HAS_SCHEMA_2x3
 	init_IteratorImplementation_Ifc2x3(this);
-#endif	
+#endif
 #ifdef HAS_SCHEMA_4
 	init_IteratorImplementation_Ifc4(this);
-#endif	
+#endif
 #ifdef HAS_SCHEMA_4x1
 	init_IteratorImplementation_Ifc4x1(this);
-#endif	
+#endif
 #ifdef HAS_SCHEMA_4x2
 	init_IteratorImplementation_Ifc4x2(this);
-#endif	
+#endif
 #ifdef HAS_SCHEMA_4x3_rc1
 	init_IteratorImplementation_Ifc4x3_rc1(this);
-#endif	
+#endif
 #ifdef HAS_SCHEMA_4x3_rc2
 	init_IteratorImplementation_Ifc4x3_rc2(this);
 #endif
diff --git a/src/ifcgeom_schema_agnostic/IteratorImplementation.h b/src/ifcgeom_schema_agnostic/IteratorImplementation.h
index 34badca50e..6ba9a55a34 100644
--- a/src/ifcgeom_schema_agnostic/IteratorImplementation.h
+++ b/src/ifcgeom_schema_agnostic/IteratorImplementation.h
@@ -46,7 +46,7 @@ struct get_factory_type<double, double> {
 };
 
 template <typename P, typename PP>
-class IteratorFactoryImplementation : public std::map<std::string, typename get_factory_type<P, PP>::type> {
+class IFC_GEOM_API IteratorFactoryImplementation : public std::map<std::string, typename get_factory_type<P, PP>::type> {
 public:
 	IteratorFactoryImplementation();
 	void bind(const std::string& schema_name, typename get_factory_type<P, PP>::type fn);
@@ -78,4 +78,4 @@ namespace IfcGeom {
 
 }
 
-#endif
\ No newline at end of file
+#endif