diff --git a/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake b/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
index 708bad0697..fb760fc2fe 100644
--- a/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
+++ b/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
@@ -2,7 +2,7 @@ macro(ConfigureCMakeVariables)
     # ================================================================================
     # Output directories for install target
 
-    if(WIN32)
+    if(MSVC)
         set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Installation root directory")
         set(CMAKE_INSTALL_BINDIR bin CACHE PATH "Output directory for executables")
         set(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
diff --git a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
index 1a58efa3e5..92f21a21b6 100644
--- a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
+++ b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
@@ -75,7 +75,7 @@ macro(SetupSalomeSMESH)
         if(NOT FREECAD_USE_EXTERNAL_SMESH)
             find_package(MEDFile REQUIRED)
             # See https://www.hdfgroup.org/HDF5/release/cmakebuild.html
-            if (WIN32)
+            if (MSVC)
                 find_package(HDF5 COMPONENTS NO_MODULE REQUIRED static)
             else()
                 find_package(PkgConfig)
diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h
index 094e1056ea..05f9febd3e 100644
--- a/src/App/PropertyExpressionEngine.h
+++ b/src/App/PropertyExpressionEngine.h
@@ -172,7 +172,7 @@ private:
     using DiGraph = boost::adjacency_list< boost::listS, boost::vecS, boost::directedS >;
     using Edge = std::pair<int, int>;
     // Note: use std::map instead of unordered_map to keep the binding order stable
-    #if defined(FC_OS_MACOSX) || defined(FC_OS_BSD)
+    #if defined(FC_OS_MACOSX) || defined(FC_OS_BSD) || defined(_LIBCPP_VERSION)
     using ExpressionMap = std::map<App::ObjectIdentifier, ExpressionInfo>;
     #else
     using ExpressionMap = std::map<const App::ObjectIdentifier, ExpressionInfo>;
diff --git a/src/Base/Builder3D.h b/src/Base/Builder3D.h
index fd14e9188b..df43ba08e9 100644
--- a/src/Base/Builder3D.h
+++ b/src/Base/Builder3D.h
@@ -26,12 +26,9 @@
 
 // Std. configurations
 
-#ifdef __GNUC__
-#include <cstdint>
-#endif
-
 #include <sstream>
 #include <vector>
+#include <cstdint>
 #include <Base/Tools3D.h>
 #ifndef FC_GLOBAL_H
 #include <FCGlobal.h>