diff --git a/src/ifcgeom/IfcGeomElement.h b/src/ifcgeom/IfcGeomElement.h
index 820727533a..ef34462df9 100644
--- a/src/ifcgeom/IfcGeomElement.h
+++ b/src/ifcgeom/IfcGeomElement.h
@@ -101,8 +101,8 @@ namespace IfcGeom {
 			oss << "product-" << IfcParse::IfcGlobalId(guid).formatted();
 			if (!_context.empty()) {
 				std::string ctx = _context;
-				std::transform(ctx.begin(), ctx.end(), ctx.begin(), ::tolower);
-				std::replace(ctx.begin(), ctx.end(), ' ', '-');
+                boost::to_lower(ctx);
+                boost::replace_all(ctx, " ", "-");
 				oss << "-" << ctx;
 			}
 			_unique_id = oss.str();
@@ -167,4 +167,4 @@ namespace IfcGeom {
 	};
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ifcgeom/IfcGeomRenderStyles.h b/src/ifcgeom/IfcGeomRenderStyles.h
index 5c499d58dc..39a67136dd 100644
--- a/src/ifcgeom/IfcGeomRenderStyles.h
+++ b/src/ifcgeom/IfcGeomRenderStyles.h
@@ -27,6 +27,9 @@
 #include "../ifcparse/Ifc2x3.h"
 #endif
 
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/replace.hpp>
+
 namespace IfcGeom {
 	class IFC_GEOM_API SurfaceStyle {
 	public:
@@ -63,8 +66,8 @@ namespace IfcGeom {
         {
 			std::stringstream sstr; 
 			std::string sanitized = name;
-			std::transform(sanitized.begin(), sanitized.end(), sanitized.begin(), ::tolower);
-			std::replace(sanitized.begin(), sanitized.end(), ' ', '-');
+            boost::to_lower(sanitized);
+            boost::replace_all(sanitized, " ", "-");
 			sstr << "surface-style-" << id << "-" << sanitized;
 			this->name = sstr.str(); 
 		}