1 files changed, 12 insertions, 10 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 335f70e4bba7..2070f68e1663 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 #include <sal/config.h>
 
 #include <mutex>
@@ -34,7 +35,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/inputtypes.hxx>
 #include <vcl/lok.hxx>
-#ifndef LIBO_HEADLESS
+#if HAVE_FEATURE_UI
 # include <vcl/opengl/OpenGLContext.hxx>
 #endif
 
@@ -562,32 +563,33 @@ std::shared_ptr<vcl::BackendCapabilities> SvpSalInstance::GetBackendCapabilities
 
 //obviously doesn't actually do anything, it's just a nonfunctional stub
 
-#ifdef LIBO_HEADLESS
+#if HAVE_FEATURE_UI
 
-class SvpOpenGLContext
+class SvpOpenGLContext : public OpenGLContext
 {
+    GLWindow m_aGLWin;
+private:
+    virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
+    virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
 };
 
 OpenGLContext* SvpSalInstance::CreateOpenGLContext()
 {
-    return nullptr;
+    return new SvpOpenGLContext;
 }
 
 #else
 
-class SvpOpenGLContext : public OpenGLContext
+class SvpOpenGLContext
 {
-    GLWindow m_aGLWin;
-private:
-    virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
-    virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
 };
 
 OpenGLContext* SvpSalInstance::CreateOpenGLContext()
 {
-    return new SvpOpenGLContext;
+    return nullptr;
 }
 
+
 #endif
 
 SvpSalTimer::~SvpSalTimer()