diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 63c8712908..604bb3781b 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -220,15 +220,23 @@ ENDIF()
 FIND_LIBRARY(libCGAL NAMES CGAL PATHS ${CGAL_LIBRARY_DIR} NO_DEFAULT_PATH)
 IF(libCGAL)
         MESSAGE(STATUS "CGAL library files found")
+        foreach(lib ${CGAL_LIBRARY_NAMES})
+            string(REPLACE libCGAL "${lib}" lib_path "${libCGAL}")
+            list(APPEND CGAL_LIBRARIES "${lib_path}")
+        endforeach()
 ELSE()
-        MESSAGE(FATAL_ERROR "Unable to find CGAL library files, aborting")
+        FILE(GLOB CGAL_LIBRARIES ${CGAL_LIBRARY_DIR}/CGAL*.lib)
+        LIST(LENGTH CGAL_LIBRARY_NAMES num_cgal_library_names)
+        LIST(LENGTH CGAL_LIBRARIES num_cgal_libraries)
+        LINK_DIRECTORIES("${CGAL_LIBRARY_DIR}")
+        if(NOT "${num_cgal_library_names}" STREQUAL "${num_cgal_library_names}")
+            MESSAGE(FATAL_ERROR "Unable to find CGAL library files, aborting")
+        endif()
+        MESSAGE(STATUS "CGAL library files found")
 ENDIF()
-foreach(lib ${CGAL_LIBRARY_NAMES})
-    string(REPLACE libCGAL "${lib}" lib_path "${libCGAL}")
-    list(APPEND CGAL_LIBRARIES "${lib_path}")
-endforeach()
-FIND_LIBRARY(libGMP NAMES gmp PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
-FIND_LIBRARY(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
+# TODO: Remove hardcoded version numbers for windows
+FIND_LIBRARY(libGMP NAMES gmp "libgmp-10" PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
+FIND_LIBRARY(libMPFR NAMES mpfr "libmpfr-4" PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
 IF(NOT libGMP)
         MESSAGE(FATAL_ERROR "Unable to find GMP library files, aborting")
 ENDIF()
diff --git a/src/ifcgeom/kernels/cgal/CgalEntityMapping.h b/src/ifcgeom/kernels/cgal/CgalEntityMapping.h
index 379d855231..371a2b7769 100644
--- a/src/ifcgeom/kernels/cgal/CgalEntityMapping.h
+++ b/src/ifcgeom/kernels/cgal/CgalEntityMapping.h
@@ -46,7 +46,9 @@ SHAPE(IfcSphere);
 SHAPE(IfcRectangularPyramid);
 SHAPE(IfcRightCircularCylinder);
 SHAPE(IfcRightCircularCone);
+#ifdef USE_IFC4
 SHAPE(IfcTriangulatedFaceSet);
+#endif
 SHAPE(IfcHalfSpaceSolid);
 
 FACE(IfcArbitraryClosedProfileDef);
diff --git a/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp b/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp
index e419996de2..ce8f1fa17f 100644
--- a/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp
+++ b/src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp
@@ -876,6 +876,7 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRightCircularCone* l, cgal
   return true;
 }
 
+#ifdef USE_IFC4
 bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcTriangulatedFaceSet* l, cgal_shape_t& shape) {
   IfcSchema::IfcCartesianPointList3D* point_list = l->Coordinates();
   const std::vector< std::vector<double> > coordinates = point_list->CoordList();
@@ -937,6 +938,7 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcTriangulatedFaceSet* l, cg
   shape = CGAL::Nef_polyhedron_3<Kernel>(polyhedron);
   return true;
 }
+#endif
 
 bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcHalfSpaceSolid* l, cgal_shape_t& shape) {
   IfcSchema::IfcSurface* surface = l->BaseSurface();