diff --git a/src/ifcgeom/taxonomy.h b/src/ifcgeom/taxonomy.h
index 4ba0ad409d..f20313296d 100644
--- a/src/ifcgeom/taxonomy.h
+++ b/src/ifcgeom/taxonomy.h
@@ -100,7 +100,7 @@ struct eigen_base {
 		o << std::string(indent, ' ') << class_name;
 		if (this->components_) {
 			int n = T::RowsAtCompileTime * T::ColsAtCompileTime;
-			for (int i = 0; i < n; ++i) {
+			for (size_t i = 0; i < n; ++i) {
 				o << " " << (*components_)(i);
 			}
 		}
diff --git a/src/ifcparse/IfcBaseClass.h b/src/ifcparse/IfcBaseClass.h
index 0f17925fc6..42ef24c2b8 100644
--- a/src/ifcparse/IfcBaseClass.h
+++ b/src/ifcparse/IfcBaseClass.h
@@ -25,12 +25,12 @@
 #include "../ifcparse/IfcEntityInstanceData.h"
 #include "../ifcparse/IfcSchema.h"
 #include "../ifcparse/utils.h"
-#include "../ifcparse/Argument.h"
 
 #include <boost/shared_ptr.hpp>
 
 #include <atomic>
 
+class Argument;
 class aggregate_of_instance;
 
 namespace IfcUtil {