diff --git a/src/ifcgeom/kernels/opencascade/IfcGeomTree.h b/src/ifcgeom/kernels/opencascade/IfcGeomTree.h
index 0bdb99151a..565bd4d535 100644
--- a/src/ifcgeom/kernels/opencascade/IfcGeomTree.h
+++ b/src/ifcgeom/kernels/opencascade/IfcGeomTree.h
@@ -49,6 +49,7 @@
 #include <stack>
 #include <unordered_map>
 #include <unordered_set>
+#include <cstdint>
 #include <BRepExtrema_TriangleSet.hxx>
 #include <BRepLProp_SLProps.hxx>
 #include <BVH_BinaryTree.hxx>
diff --git a/src/ifcgeom/kernels/opencascade/clash_utils.cpp b/src/ifcgeom/kernels/opencascade/clash_utils.cpp
index d6050bf87c..cfc7687b73 100644
--- a/src/ifcgeom/kernels/opencascade/clash_utils.cpp
+++ b/src/ifcgeom/kernels/opencascade/clash_utils.cpp
@@ -1,5 +1,7 @@
 #include "clash_utils.h"
 #include <cassert>
+#include <cstdint>
+#include <cfloat>
 
 #define GU_CULLING_EPSILON_RAY_TRIANGLE FLT_EPSILON*FLT_EPSILON
 #define PX_MAX_F32 3.4028234663852885981170418348452e+38F
diff --git a/src/ifcgeom/mapping/mapping.h b/src/ifcgeom/mapping/mapping.h
index 1055fe093b..3cda260568 100644
--- a/src/ifcgeom/mapping/mapping.h
+++ b/src/ifcgeom/mapping/mapping.h
@@ -8,6 +8,7 @@
 
 #include <mutex>
 #include <unordered_set>
+#include <cstdint>
 
 #define INCLUDE_SCHEMA(x) STRINGIFY(../../ifcparse/schemas/x.h)
 #include INCLUDE_SCHEMA(IfcSchema)
diff --git a/src/ifcgeom/taxonomy.h b/src/ifcgeom/taxonomy.h
index 81c48be3f9..a725ca2be9 100644
--- a/src/ifcgeom/taxonomy.h
+++ b/src/ifcgeom/taxonomy.h
@@ -17,6 +17,13 @@
 #include <tuple>
 #include <exception>
 #include <numeric>
+#include <cstdint>
+#include <cmath>
+#include <array>
+#include <limits>
+#include <functional>
+#include <algorithm>
+#include <stdexcept>
 
 #ifndef TAXONOMY_USE_UNIQUE_PTR
 #ifndef TAXONOMY_USE_NAKED_PTR
@@ -1623,25 +1630,25 @@ typedef item const* ptr;
 				// @todo Sad... now that we have templated collection members,
 				// we can't generally use collection_base anymore as a cast target.
 				if (auto s = taxonomy::dcast<taxonomy::collection>(i)) {
-					visit<taxonomy::collection>(s, fn);
+					ifcopenshell::geometry::visit<taxonomy::collection>(s, fn);
 				}
 				else if (auto s = taxonomy::dcast<taxonomy::loop>(i)) {
-					visit<taxonomy::loop>(s, fn);
+					ifcopenshell::geometry::visit<taxonomy::loop>(s, fn);
 				}
 				else if (auto s = taxonomy::dcast<taxonomy::face>(i)) {
-					visit<taxonomy::face>(s, fn);
+					ifcopenshell::geometry::visit<taxonomy::face>(s, fn);
 				}
 				else if (auto s = taxonomy::dcast<taxonomy::shell>(i)) {
-					visit<taxonomy::shell>(s, fn);
+					ifcopenshell::geometry::visit<taxonomy::shell>(s, fn);
 				}
 				else if (auto s = taxonomy::dcast<taxonomy::solid>(i)) {
-					visit<taxonomy::solid>(s, fn);
+					ifcopenshell::geometry::visit<taxonomy::solid>(s, fn);
 				}
 				else if (auto s = taxonomy::dcast<taxonomy::loft>(i)) {
-					visit<taxonomy::loft>(s, fn);
+					ifcopenshell::geometry::visit<taxonomy::loft>(s, fn);
 				}
 				else if (auto s = taxonomy::dcast<taxonomy::boolean_result>(i)) {
-					visit<taxonomy::boolean_result>(s, fn);
+					ifcopenshell::geometry::visit<taxonomy::boolean_result>(s, fn);
 				}
 				else {
 					fn(i);
@@ -1756,4 +1763,4 @@ typedef item const* ptr;
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ifcparse/character_decoder.cpp b/src/ifcparse/character_decoder.cpp
index 89b96156cc..2b3c583c70 100644
--- a/src/ifcparse/character_decoder.cpp
+++ b/src/ifcparse/character_decoder.cpp
@@ -288,7 +288,7 @@ namespace {
                 if (character >= 0x20 && character <= 0x7e) {
                     stream.put((char)character);
                 } else {
-                    stream << "\\u" << character;
+                    stream << "\\u" << static_cast<uint32_t>(character);
                 }
             });
             return stream.str();
diff --git a/src/ifcparse/file.h b/src/ifcparse/file.h
index 0a720c914e..ecc823e156 100644
--- a/src/ifcparse/file.h
+++ b/src/ifcparse/file.h
@@ -35,6 +35,7 @@
 #include <iterator>
 #include <map>
 #include <memory>
+#include <cstdint>
 
 #ifdef IFOPSH_WITH_ROCKSDB
 
diff --git a/src/ifcparse/instance_data.h b/src/ifcparse/instance_data.h
index d80d9d2d0c..d41265f221 100644
--- a/src/ifcparse/instance_data.h
+++ b/src/ifcparse/instance_data.h
@@ -37,6 +37,11 @@
 
 #endif
 
+#include <cstdint>
+#include <cstring>
+
+#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/logic/tribool.hpp>
 #include <boost/dynamic_bitset.hpp>
 
diff --git a/src/ifcparse/rocksdb_map_adapter.h b/src/ifcparse/rocksdb_map_adapter.h
index 7d0e5a8f63..2ea85bd215 100644
--- a/src/ifcparse/rocksdb_map_adapter.h
+++ b/src/ifcparse/rocksdb_map_adapter.h
@@ -30,6 +30,8 @@
 #include <utility>
 #include <iterator>
 #include <cstddef>
+#include <cstdint>
+#include <cstring>
 
 template <typename T>
 struct is_std_tuple : std::false_type {};
diff --git a/src/ifcparse/schema.h b/src/ifcparse/schema.h
index bd7e231f77..9806292eb2 100644
--- a/src/ifcparse/schema.h
+++ b/src/ifcparse/schema.h
@@ -26,8 +26,10 @@
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
 #include <cctype>
+#include <cstdint>
 #include <iterator>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 #include <optional>
diff --git a/src/ifcparse/storage.h b/src/ifcparse/storage.h
index 6b339bb8bb..ed9d93f827 100644
--- a/src/ifcparse/storage.h
+++ b/src/ifcparse/storage.h
@@ -33,6 +33,7 @@ namespace rocksdb {
 #include <iterator>
 #include <map>
 #include <memory>
+#include <cstring>
 #include <type_traits>
 #include <iostream>
 #include <deque>
diff --git a/src/ifcparse/variant_array.h b/src/ifcparse/variant_array.h
index 69c4adee45..d14f31148a 100644
--- a/src/ifcparse/variant_array.h
+++ b/src/ifcparse/variant_array.h
@@ -33,6 +33,10 @@ variant - which is the maximum size of its constituents - is reduced.
 #include <utility>
 #include <memory>
 #include <tuple>
+#include <cstdint>
+#include <cstring>
+#include <cstddef>
+#include <limits>
 
 #include "exception.h"
 
diff --git a/src/serializers/GltfSerializer.cpp b/src/serializers/GltfSerializer.cpp
index 83b0ddedbe..2948798fec 100644
--- a/src/serializers/GltfSerializer.cpp
+++ b/src/serializers/GltfSerializer.cpp
@@ -23,6 +23,8 @@
 
 #include "../ifcparse/utils.h"
 
+#include <cstdint>
+
 #ifdef WITH_PROJ
 #include <proj.h>
 #endif
diff --git a/src/serializers/RocksDbSerializer.cpp b/src/serializers/RocksDbSerializer.cpp
index c7247938f1..774e08045c 100644
--- a/src/serializers/RocksDbSerializer.cpp
+++ b/src/serializers/RocksDbSerializer.cpp
@@ -4,6 +4,9 @@
 
 #include <rocksdb/options.h>
 
+#include <cstdint>
+#include <cstring>
+
 #include "../ifcparse/logger.h"
 
 RocksDbSerializer::RocksDbSerializer(const std::string& input_filename, const std::string& rocksdb_filename, const std::vector<std::string>& skip_supertypes)