diff --git a/plugins/platforms/hwcomposer/hwcomposer_backend.cpp b/plugins/platforms/hwcomposer/hwcomposer_backend.cpp
index e72e9458de..d871568d88 100644
--- a/plugins/platforms/hwcomposer/hwcomposer_backend.cpp
+++ b/plugins/platforms/hwcomposer/hwcomposer_backend.cpp
@@ -27,14 +27,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "wayland_server.h"
 // KWayland
 #include <KWayland/Server/display.h>
-#include <KWayland/Server/output_interface.h>
 #include <KWayland/Server/seat_interface.h>
 // Qt
 #include <QKeyEvent>
 #include <QDBusConnection>
 // hybris/android
 #include <hardware/hardware.h>
-#include <hardware/hwcomposer.h>
 #include <hardware/lights.h>
 // linux
 #include <linux/input.h>
@@ -164,7 +162,7 @@ HwcomposerBackend::~HwcomposerBackend()
     }
 }
 
-static KWayland::Server::OutputInterface *createOutput(hwc_composer_device_1_t *device)
+KWayland::Server::OutputInterface* HwcomposerBackend::createOutput(hwc_composer_device_1_t *device)
 {
     uint32_t configs[5];
     size_t numConfigs = 5;
diff --git a/plugins/platforms/hwcomposer/hwcomposer_backend.h b/plugins/platforms/hwcomposer/hwcomposer_backend.h
index f7012e843e..29ae5a5f8e 100644
--- a/plugins/platforms/hwcomposer/hwcomposer_backend.h
+++ b/plugins/platforms/hwcomposer/hwcomposer_backend.h
@@ -28,10 +28,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <android-config.h>
 // libhybris
+#include <hardware/hwcomposer.h>
 #include <hwcomposer_window.h>
 // needed as hwcomposer_window.h includes EGL which on non-arm includes Xlib
 #include <fixx11h.h>
 
+#include <KWayland/Server/output_interface.h>
+
 typedef struct hwc_display_contents_1 hwc_display_contents_1_t;
 typedef struct hwc_layer_1 hwc_layer_1_t;
 typedef struct hwc_composer_device_1 hwc_composer_device_1_t;
@@ -101,6 +104,7 @@ private Q_SLOTS:
 private:
     void initLights();
     void toggleScreenBrightness();
+    KWayland::Server::OutputInterface* createOutput(hwc_composer_device_1_t *device);
     QSize m_displaySize;
     hwc_composer_device_1_t *m_device = nullptr;
     light_device_t *m_lights = nullptr;