diff --git a/abb_egm_hardware_interface/CMakeLists.txt b/abb_egm_hardware_interface/CMakeLists.txt
index 080320b..4a3686f 100644
--- a/abb_egm_hardware_interface/CMakeLists.txt
+++ b/abb_egm_hardware_interface/CMakeLists.txt
@@ -124,6 +124,11 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   target_compile_options(${target_name} PRIVATE /W4)
 endif()
 
+## Restrict Windows header namespace usage
+if (WIN32)
+  target_compile_definitions(${target_name} PUBLIC -DNOGDI)
+endif()
+
 #-----------------------------
 # Executable target
 #-----------------------------
diff --git a/abb_egm_state_controller/CMakeLists.txt b/abb_egm_state_controller/CMakeLists.txt
index d2e739f..fe4dbcf 100644
--- a/abb_egm_state_controller/CMakeLists.txt
+++ b/abb_egm_state_controller/CMakeLists.txt
@@ -105,6 +105,11 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   target_compile_options(${target_name} PRIVATE /W4)
 endif()
 
+## Restrict Windows header namespace usage
+if (WIN32)
+  target_compile_definitions(${target_name} PUBLIC -DNOGDI)
+endif()
+
 #===========================================================
 # Install
 #===========================================================