5 files changed, 9 insertions, 12 deletions
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 8179e0c95097..41a30c8ed5ec 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -46,10 +46,10 @@
 #include <android/androidinst.hxx>
 #endif
 
-#if !(defined _WIN32 || defined MACOSX)
 #if USING_X11
 #define DESKTOPDETECT
 #endif
+#if ENABLE_HEADLESS
 #define HEADLESS_VCLPLUG
 #endif
 
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 4ed38bc70153..8b6730a81447 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -24,10 +24,6 @@
 #include <PhysicalFontFamily.hxx>
 #include <sal/log.hxx>
 
-#if !(defined(_WIN32) || defined(MACOSX) || defined(IOS))
-#include <unx/glyphcache.hxx>
-#endif
-
 size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD ) const
 {
     return rFSD.hashCode();
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index ee2047548103..b2f6e4a874e7 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <vcl/opengl/OpenGLHelper.hxx>
+#include <config_vclplug.h>
 
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
@@ -38,7 +39,7 @@
 #include <vcl/skia/SkiaHelper.hxx>
 #include <vcl/glxtestprocess.hxx>
 
-#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined HAIKU
+#if USING_X11
 #include <opengl/x11/X11DeviceInfo.hxx>
 #elif defined (_WIN32)
 #include <opengl/win/WinDeviceInfo.hxx>
@@ -200,7 +201,7 @@ namespace
 
     OString getDeviceInfoString()
     {
-#if defined( SAL_UNX ) && !defined( MACOSX ) && !defined( IOS )&& !defined( ANDROID ) && !defined( HAIKU )
+#if USING_X11
         const X11OpenGLDeviceInfo aInfo;
         return aInfo.GetOS() +
             aInfo.GetOSRelease() +
@@ -762,7 +763,7 @@ bool OpenGLHelper::isDeviceDenylisted()
     {
         OpenGLZone aZone;
 
-#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined HAIKU
+#if USING_X11
         X11OpenGLDeviceInfo aInfo;
         bDenylisted = aInfo.isDeviceBlocked();
         SAL_INFO("vcl.opengl", "denylisted: " << bDenylisted);
diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx
index 0d43db107d9a..bc654bbb7975 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
+#include <config_vclplug.h>
 
 #include <osl/mutex.hxx>
 #include <sot/exchange.hxx>
@@ -498,7 +498,7 @@ Reference<XClipboard> GetSystemPrimarySelection()
     try
     {
         Reference<XComponentContext> xContext(comphelper::getProcessComponentContext());
-#if HAVE_FEATURE_X11
+#if USING_X11
         // A hack, making the primary selection available as an instance
         // of the SystemClipboard service on X11:
         Sequence< Any > args(1);
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index e57485927eed..d1b3590ed97b 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include <config_features.h>
 #include <config_feature_desktop.h>
+#include <config_vclplug.h>
 
 #include <tools/time.hxx>
 
@@ -745,7 +745,7 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource()
                     aDropTargetSN = "com.sun.star.datatransfer.dnd.OleDropTarget";
                     aDragSourceAL[ 1 ] <<= static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) );
                     aDropTargetAL[ 0 ] <<= static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) );
-#elif HAVE_FEATURE_X11
+#elif USING_X11
                     aDragSourceSN = "com.sun.star.datatransfer.dnd.X11DragSource";
                     aDropTargetSN = "com.sun.star.datatransfer.dnd.X11DropTarget";