diff --git a/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake b/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake
index fc734d5f84..39107344a0 100644
--- a/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake
+++ b/cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake
@@ -90,4 +90,8 @@ macro(SetGlobalCompilerAndLinkerSettings)
             link_libraries(-lgdi32)
         endif()
     endif(MINGW)
+
+    # Enable the Topological Naming Problem mitigation code
+    add_compile_options(-DFC_ENABLE_TNP_FIX)
+
 endmacro(SetGlobalCompilerAndLinkerSettings)