5 files changed, 9 insertions, 9 deletions
diff --git a/basic/CppunitTest_basic_coverage.mk b/basic/CppunitTest_basic_coverage.mk
index e1189e5eb790..1d337b5f90a1 100644
--- a/basic/CppunitTest_basic_coverage.mk
+++ b/basic/CppunitTest_basic_coverage.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_coverage, \
     $(gb_UWINAPI) \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_coverage, \
     oleaut32 \
 ))
diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk
index 5f6587dec684..7a1c3da5a8cf 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
 	$(gb_UWINAPI) \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \
 	oleaut32 \
 ))
diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk
index 268f29a43b1c..f7db5a1d1d5e 100644
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
 	$(gb_UWINAPI) \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \
 	oleaut32 \
 ))
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index b5eccfa2d7b8..bd566af81e23 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
 	$(gb_UWINAPI) \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \
 	oleaut32 \
 ))
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 16bb39efe0b4..8597b21de439 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -138,18 +138,18 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 	canvastools \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,sb,\
 	oleaut32 \
 ))
 endif
 
-ifeq ($(GUI)$(CPUNAME),WNTINTEL)
+ifeq ($(OS)$(CPUNAME),WNTINTEL)
 $(eval $(call gb_Library_add_exception_objects,sb,\
 	basic/source/runtime/dllmgr-x86 \
 ))
 else
-ifeq ($(GUI)$(CPUNAME),WNTX86_64)
+ifeq ($(OS)$(CPUNAME),WNTX86_64)
 $(eval $(call gb_Library_add_exception_objects,sb,\
 	basic/source/runtime/dllmgr-x64 \
 ))
@@ -159,12 +159,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 ))
 endif
 endif
-ifeq ($(GUI)$(COM)$(CPUNAME),WNTMSCINTEL)
+ifeq ($(OS)$(COM)$(CPUNAME),WNTMSCINTEL)
 $(eval $(call gb_Library_add_asmobjects,sb,\
 	basic/source/runtime/wnt-x86 \
 ))
 endif
-ifeq ($(GUI)$(COM)$(CPUNAME),WNTGCCINTEL)
+ifeq ($(OS)$(COM)$(CPUNAME),WNTGCCINTEL)
 $(eval $(call gb_Library_add_asmobjects,sb,\
 	basic/source/runtime/wnt-mingw \
 ))