diff --git a/src/ifcgeom/IfcGeom.h b/src/ifcgeom/IfcGeom.h
index 19862f3613..453fba0f79 100644
--- a/src/ifcgeom/IfcGeom.h
+++ b/src/ifcgeom/IfcGeom.h
@@ -199,7 +199,6 @@ private:
 	double ifc_planeangle_unit;
 	double modelling_precision;
 	double dimensionality;
-	faceset_helper* faceset_helper_;
 
 #ifndef NO_CACHE
 	MAKE_TYPE_NAME(Cache) cache;
@@ -212,6 +211,8 @@ private:
 	 // For stopping PlacementRelTo recursion in convert(const IfcSchema::IfcObjectPlacement* l, gp_Trsf& trsf)
 	const IfcParse::declaration* placement_rel_to;
 
+	faceset_helper* faceset_helper_;
+
 public:
 	MAKE_TYPE_NAME(Kernel)()
 		: IfcGeom::Kernel(0)
diff --git a/src/ifcgeom/IfcRepresentationShapeItem.h b/src/ifcgeom/IfcRepresentationShapeItem.h
index e78584929c..58a77c4c5b 100644
--- a/src/ifcgeom/IfcRepresentationShapeItem.h
+++ b/src/ifcgeom/IfcRepresentationShapeItem.h
@@ -28,10 +28,10 @@
 namespace IfcGeom {	
 	class IFC_GEOM_API IfcRepresentationShapeItem {
 	private:
+		int id;
 		gp_GTrsf placement;
 		TopoDS_Shape shape;
 		const SurfaceStyle* style;
-		int id;
 	public:
 		IfcRepresentationShapeItem(int id, const gp_GTrsf& placement, const TopoDS_Shape& shape, const SurfaceStyle* style)
 			: id(id), placement(placement), shape(shape), style(style) {}
diff --git a/src/ifcparse/IfcSpfHeader.cpp b/src/ifcparse/IfcSpfHeader.cpp
index 49f7f9df18..5b95e68dcf 100644
--- a/src/ifcparse/IfcSpfHeader.cpp
+++ b/src/ifcparse/IfcSpfHeader.cpp
@@ -36,7 +36,9 @@ static const char * const DATA				= "DATA";
 using namespace IfcParse;
 
 HeaderEntity::HeaderEntity(const char * const datatype, size_t size, IfcFile* file)
-	: IfcEntityInstanceData(file, size), size_(size), _datatype(datatype)
+	: IfcEntityInstanceData(file, size)
+	, _datatype(datatype)
+	, size_(size)
 {
 	if (file) {
 		offset_in_file_ = file->stream->Tell();