Qt-ify the QtCompositor module

Currently the QtCompositor library and API do not follow the Qt API
naming conventions.  This commit intends to fix these inconsistencies.

filenames start with q
headers containing private API's end in _p
public API classes begin with Q
use the qt namespace macros where necessary

Wayland namespace is now QtWayland
wayland_wrapper classes are now private API's

It's important to make these changes not just for stylistic reasons, but
also because when qmake builds the module in checks for these
conventions to determine how to deploy the include files.

Change-Id: I8bfadeceda92a0f52cb73c704551da75540e7587
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

35 files changed, 391 insertions, 256 deletions

diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp
index a0716f3b2..26defc0ba 100644
--- a/src/compositor/wayland_wrapper/wlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp
@@ -38,22 +38,23 @@
 **
 ****************************************************************************/
 
-#include "wlcompositor.h"
-
-#include "waylandinput.h"
-#include "wldisplay.h"
-#include "wlsurface.h"
-#include "waylandcompositor.h"
-#include "wldatadevicemanager.h"
-#include "wldatadevice.h"
-#include "wlextendedoutput.h"
-#include "wlextendedsurface.h"
-#include "wlsubsurface.h"
-#include "wlshellsurface.h"
-#include "wltouch.h"
-#include "wlqtkey.h"
-#include "wlinputdevice.h"
-#include "wlregion.h"
+#include "qwlcompositor_p.h"
+
+#include "qwaylandinput.h"
+#include "qwldisplay_p.h"
+#include "qwloutput_p.h"
+#include "qwlsurface_p.h"
+#include "qwaylandcompositor.h"
+#include "qwldatadevicemanager_p.h"
+#include "qwldatadevice_p.h"
+#include "qwlextendedoutput_p.h"
+#include "qwlextendedsurface_p.h"
+#include "qwlsubsurface_p.h"
+#include "qwlshellsurface_p.h"
+#include "qwltouch_p.h"
+#include "qwlqtkey_p.h"
+#include "qwlinputdevice_p.h"
+#include "qwlregion_p.h"
 
 #include <QWindow>
 #include <QSocketNotifier>
@@ -80,12 +81,14 @@
 
 #include <wayland-server.h>
 
-#include "hardware_integration/graphicshardwareintegration.h"
+#include "hardware_integration/qwaylandgraphicshardwareintegration.h"
 #include "waylandwindowmanagerintegration.h"
 
-#include "hardware_integration/graphicshardwareintegrationfactory.h"
+#include "hardware_integration/qwaylandgraphicshardwareintegrationfactory.h"
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 static Compositor *compositor;
 
@@ -119,7 +122,7 @@ Compositor *Compositor::instance()
     return compositor;
 }
 
-Compositor::Compositor(WaylandCompositor *qt_compositor)
+Compositor::Compositor(QWaylandCompositor *qt_compositor)
     : m_display(new Display)
     , m_default_input_device(0)
     , m_pageFlipper(0)
@@ -144,7 +147,7 @@ Compositor::Compositor(WaylandCompositor *qt_compositor)
 #if defined (QT_COMPOSITOR_WAYLAND_GL)
     QWindow *window = qt_compositor->window();
     if (window && window->surfaceType() != QWindow::RasterSurface) {
-        QStringList keys = GraphicsHardwareIntegrationFactory::keys();
+        QStringList keys = QWaylandGraphicsHardwareIntegrationFactory::keys();
         QString targetKey;
         QByteArray hardwareIntegration = qgetenv("QT_WAYLAND_HARDWARE_INTEGRATION");
         if (keys.contains(QString::fromLocal8Bit(hardwareIntegration.constData()))) {
@@ -156,7 +159,7 @@ Compositor::Compositor(WaylandCompositor *qt_compositor)
         }
 
         if (!targetKey.isEmpty()) {
-            m_graphics_hw_integration = GraphicsHardwareIntegrationFactory::create(targetKey, QStringList());
+            m_graphics_hw_integration = QWaylandGraphicsHardwareIntegrationFactory::create(targetKey, QStringList());
             if (m_graphics_hw_integration) {
                 m_graphics_hw_integration->setCompositor(qt_compositor);
             }
@@ -173,7 +176,8 @@ Compositor::Compositor(WaylandCompositor *qt_compositor)
 
     wl_display_init_shm(m_display->handle());
 
-    wl_display_add_global(m_display->handle(),&wl_output_interface, &m_output_global,OutputGlobal::output_bind_func);
+    m_output_global = new OutputGlobal();
+    wl_display_add_global(m_display->handle(),&wl_output_interface, m_output_global, OutputGlobal::output_bind_func);
 
     m_shell = new Shell();
     wl_display_add_global(m_display->handle(), &wl_shell_interface, m_shell, Shell::bind_func);
@@ -217,7 +221,7 @@ Compositor::~Compositor()
 #ifdef QT_COMPOSITOR_WAYLAND_GL
     delete m_graphics_hw_integration;
 #endif
-
+    delete m_output_global;
     delete m_display;
 }
 
@@ -317,7 +321,7 @@ void Compositor::surfaceDestroyed(Surface *surface)
     waylandCompositor()->surfaceAboutToBeDestroyed(surface->waylandSurface());
 }
 
-void Compositor::markSurfaceAsDirty(Wayland::Surface *surface)
+void Compositor::markSurfaceAsDirty(QtWayland::Surface *surface)
 {
     m_dirty_surfaces.insert(surface);
 }
@@ -341,7 +345,7 @@ QWindow *Compositor::window() const
     return m_qt_compositor->window();
 }
 
-GraphicsHardwareIntegration * Compositor::graphicsHWIntegration() const
+QWaylandGraphicsHardwareIntegration * Compositor::graphicsHWIntegration() const
 {
 #ifdef QT_COMPOSITOR_WAYLAND_GL
     return m_graphics_hw_integration;
@@ -360,7 +364,7 @@ void Compositor::initializeHardwareIntegration()
 
 void Compositor::initializeDefaultInputDevice()
 {
-    m_default_wayland_input_device = new WaylandInputDevice(m_qt_compositor);
+    m_default_wayland_input_device = new QWaylandInputDevice(m_qt_compositor);
     m_default_input_device = m_default_wayland_input_device->handle();
 }
 
@@ -420,7 +424,7 @@ QList<struct wl_client *> Compositor::clients() const
 
 Qt::ScreenOrientations Compositor::orientationUpdateMaskForClient(wl_client *client)
 {
-    Output *output = m_output_global.outputForClient(client);
+    Output *output = m_output_global->outputForClient(client);
     Q_ASSERT(output);
     if (output->extendedOutput())
         return output->extendedOutput()->orientationUpdateMask();
@@ -434,7 +438,7 @@ void Compositor::setScreenOrientation(Qt::ScreenOrientation orientation)
     QList<struct wl_client*> clientList = clients();
     for (int i = 0; i < clientList.length(); ++i) {
         struct wl_client *client = clientList.at(i);
-        Output *output = m_output_global.outputForClient(client);
+        Output *output = m_output_global->outputForClient(client);
         Q_ASSERT(output);
         if (output->extendedOutput()){
             output->extendedOutput()->sendOutputOrientation(orientation);
@@ -449,22 +453,28 @@ Qt::ScreenOrientation Compositor::screenOrientation() const
 
 void Compositor::setOutputGeometry(const QRect &geometry)
 {
-    m_output_global.setGeometry(geometry);
+    if (m_output_global)
+        m_output_global->setGeometry(geometry);
 }
 
 QRect Compositor::outputGeometry() const
 {
-    return m_output_global.geometry();
+    if (m_output_global)
+        return m_output_global->geometry();
+    return QRect();
 }
 
 void Compositor::setOutputRefreshRate(int rate)
 {
-    m_output_global.setRefreshRate(rate);
+    if (m_output_global)
+        m_output_global->setRefreshRate(rate);
 }
 
 int Compositor::outputRefreshRate() const
 {
-    return m_output_global.refreshRate();
+    if (m_output_global)
+        return m_output_global->refreshRate();
+    return 0;
 }
 
 void Compositor::setClientFullScreenHint(bool value)
@@ -477,9 +487,9 @@ InputDevice* Compositor::defaultInputDevice()
     return m_default_input_device;
 }
 
-QList<Wayland::Surface *> Compositor::surfacesForClient(wl_client *client)
+QList<QtWayland::Surface *> Compositor::surfacesForClient(wl_client *client)
 {
-    QList<Wayland::Surface *> ret;
+    QList<QtWayland::Surface *> ret;
 
     for (int i=0; i < m_surfaces.count(); ++i) {
         if (m_surfaces.at(i)->base()->resource.client == client) {
@@ -559,3 +569,5 @@ void Compositor::sendDragEndEvent()
 }
 
 } // namespace Wayland
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlcompositor.h b/src/compositor/wayland_wrapper/qwlcompositor_p.h
index a009037b5..628470681 100644
--- a/src/compositor/wayland_wrapper/wlcompositor.h
+++ b/src/compositor/wayland_wrapper/qwlcompositor_p.h
@@ -41,30 +41,32 @@
 #ifndef WL_COMPOSITOR_H
 #define WL_COMPOSITOR_H
 
-#include "waylandexport.h"
+#include <QtCompositor/qwaylandexport.h>
 
 #include <QtCore/QSet>
 #include <QtGui/QWindow>
 
-#include "wloutput.h"
-#include "wldisplay.h"
+#include <private/qwldisplay_p.h>
 
 #include <wayland-server.h>
 
-class WaylandCompositor;
-class WaylandInputDevice;
-class GraphicsHardwareIntegration;
+QT_BEGIN_NAMESPACE
+
+class QWaylandCompositor;
+class QWaylandInputDevice;
+class QWaylandGraphicsHardwareIntegration;
 class WindowManagerServerIntegration;
 class QMimeData;
 class QPlatformScreenPageFlipper;
 class QPlatformScreenBuffer;
 
-namespace Wayland {
+namespace QtWayland {
 
 class Surface;
 class SurfaceBuffer;
 class InputDevice;
 class DataDeviceManager;
+class OutputGlobal;
 class OutputExtensionGlobal;
 class SurfaceExtensionGlobal;
 class SubSurfaceExtensionGlobal;
@@ -77,7 +79,7 @@ class Q_COMPOSITOR_EXPORT Compositor : public QObject
     Q_OBJECT
 
 public:
-    Compositor(WaylandCompositor *qt_compositor);
+    Compositor(QWaylandCompositor *qt_compositor);
     ~Compositor();
 
     void frameFinished(Surface *surface = 0);
@@ -99,7 +101,7 @@ public:
 
     QWindow *window() const;
 
-    GraphicsHardwareIntegration *graphicsHWIntegration() const;
+    QWaylandGraphicsHardwareIntegration *graphicsHWIntegration() const;
     void initializeHardwareIntegration();
     void initializeDefaultInputDevice();
     void initializeWindowManagerProtocol();
@@ -112,7 +114,7 @@ public:
 
     QList<Surface*> surfaces() const { return m_surfaces; }
     QList<Surface*> surfacesForClient(wl_client* client);
-    WaylandCompositor *waylandCompositor() const { return m_qt_compositor; }
+    QWaylandCompositor *waylandCompositor() const { return m_qt_compositor; }
 
     struct wl_display *wl_display() const { return m_display->handle(); }
 
@@ -162,12 +164,12 @@ private:
     Display *m_display;
 
     /* Input */
-    WaylandInputDevice *m_default_wayland_input_device;
+    QWaylandInputDevice *m_default_wayland_input_device;
     InputDevice *m_default_input_device;
 
     /* Output */
     //make this a list of the available screens
-    OutputGlobal m_output_global;
+    OutputGlobal *m_output_global;
     //This one should be part of the outputs
     QPlatformScreenPageFlipper *m_pageFlipper;
 
@@ -182,7 +184,7 @@ private:
 
     wl_event_loop *m_loop;
 
-    WaylandCompositor *m_qt_compositor;
+    QWaylandCompositor *m_qt_compositor;
     Qt::ScreenOrientation m_orientation;
 
     Surface *m_directRenderSurface;
@@ -190,7 +192,7 @@ private:
     bool m_directRenderActive;
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-    GraphicsHardwareIntegration *m_graphics_hw_integration;
+    QWaylandGraphicsHardwareIntegration *m_graphics_hw_integration;
 #endif
 
     //extensions
@@ -212,4 +214,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif //WL_COMPOSITOR_H
diff --git a/src/compositor/wayland_wrapper/wldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp
index 2c3bc3801..89fa7a08e 100644
--- a/src/compositor/wayland_wrapper/wldatadevice.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp
@@ -38,17 +38,19 @@
 **
 ****************************************************************************/
 
-#include "wldatadevice.h"
+#include "qwldatadevice_p.h"
 
-#include "wldatasource.h"
-#include "wldataoffer.h"
-#include "wldatadevicemanager.h"
+#include "qwldatasource_p.h"
+#include "qwldataoffer_p.h"
+#include "qwldatadevicemanager_p.h"
 
 #include <stdlib.h>
 
 #include <QDebug>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 void DataDevice::start_drag(struct wl_client *client,
                    struct wl_resource *resource,
@@ -125,3 +127,5 @@ struct wl_resource *DataDevice::dataDeviceResource() const
 }
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wldatadevice.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h
index 2f1d72f21..2b4acdc9d 100644
--- a/src/compositor/wayland_wrapper/wldatadevice.h
+++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h
@@ -41,9 +41,11 @@
 #ifndef WLDATADEVICE_H
 #define WLDATADEVICE_H
 
-#include "wldatadevicemanager.h"
+#include <private/qwldatadevicemanager_p.h>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 class DataSource;
 class DataDeviceManager;
@@ -79,4 +81,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLDATADEVICE_H
diff --git a/src/compositor/wayland_wrapper/wldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
index cdfc0002b..f89dbc314 100644
--- a/src/compositor/wayland_wrapper/wldatadevicemanager.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
@@ -38,14 +38,14 @@
 **
 ****************************************************************************/
 
-#include "wldatadevicemanager.h"
-
-#include "wldatadevice.h"
-#include "wldatasource.h"
-#include "wlinputdevice.h"
-#include "wlcompositor.h"
-#include "wldataoffer.h"
-#include "wlsurface.h"
+#include "qwldatadevicemanager_p.h"
+
+#include "qwldatadevice_p.h"
+#include "qwldatasource_p.h"
+#include "qwlinputdevice_p.h"
+#include "qwlcompositor_p.h"
+#include "qwldataoffer_p.h"
+#include "qwlsurface_p.h"
 #include "qwaylandmimehelper.h"
 
 #include <QtCore/QDebug>
@@ -54,7 +54,9 @@
 #include <QtCore/private/qcore_unix_p.h>
 #include <QtCore/QFile>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 DataDeviceManager::DataDeviceManager(Compositor *compositor)
     : m_compositor(compositor)
@@ -302,3 +304,5 @@ const struct wl_data_offer_interface DataDeviceManager::compositor_offer_interfa
 };
 
 } //namespace
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wldatadevicemanager.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
index 5576a41f7..11510e63b 100644
--- a/src/compositor/wayland_wrapper/wldatadevicemanager.h
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
@@ -41,16 +41,18 @@
 #ifndef WLDATADEVICEMANAGER_H
 #define WLDATADEVICEMANAGER_H
 
-#include "wlcompositor.h"
+#include <private/qwlcompositor_p.h>
 
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtGui/QClipboard>
 #include <QtCore/QMimeData>
 
+QT_BEGIN_NAMESPACE
+
 class QSocketNotifier;
 
-namespace Wayland {
+namespace QtWayland {
 
 class Compositor;
 
@@ -124,4 +126,7 @@ private:
 };
 
 }
+
+QT_END_NAMESPACE
+
 #endif // WLDATADEVICEMANAGER_H
diff --git a/src/compositor/wayland_wrapper/wldataoffer.cpp b/src/compositor/wayland_wrapper/qwldataoffer.cpp
index 80293a7d3..c2bfea35a 100644
--- a/src/compositor/wayland_wrapper/wldataoffer.cpp
+++ b/src/compositor/wayland_wrapper/qwldataoffer.cpp
@@ -38,9 +38,9 @@
 **
 ****************************************************************************/
 
-#include "wldataoffer.h"
+#include "qwldataoffer_p.h"
 
-#include "wldatadevice.h"
+#include "qwldatadevice_p.h"
 
 #include <wayland-server.h>
 
@@ -49,7 +49,9 @@
 
 #include <QtCore/QDebug>
 
-namespace Wayland
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland
 {
 
 DataOffer::DataOffer(DataSource *data_source)
@@ -113,5 +115,6 @@ void DataOffer::destroy(wl_client *client, wl_resource *resource)
     }
 }
 
-
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wldataoffer.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h
index 4b47c977d..579434450 100644
--- a/src/compositor/wayland_wrapper/wldataoffer.h
+++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h
@@ -41,11 +41,12 @@
 #ifndef WLDATAOFFER_H
 #define WLDATAOFFER_H
 
-#include "wldatasource.h"
+#include <private/qwldatasource_p.h>
+#include <QtCompositor/qwaylandresourcecollection.h>
 
-#include "waylandresourcecollection.h"
+QT_BEGIN_NAMESPACE
 
-namespace Wayland
+namespace QtWayland
 {
 
 class DataOffer : public ResourceCollection
@@ -75,4 +76,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLDATAOFFER_H
diff --git a/src/compositor/wayland_wrapper/wldatasource.cpp b/src/compositor/wayland_wrapper/qwldatasource.cpp
index d243f0a4b..271467f2e 100644
--- a/src/compositor/wayland_wrapper/wldatasource.cpp
+++ b/src/compositor/wayland_wrapper/qwldatasource.cpp
@@ -38,16 +38,18 @@
 **
 ****************************************************************************/
 
-#include "wldatasource.h"
-#include "wldataoffer.h"
-#include "wldatadevicemanager.h"
-#include "wlcompositor.h"
+#include "qwldatasource_p.h"
+#include "qwldataoffer_p.h"
+#include "qwldatadevicemanager_p.h"
+#include "qwlcompositor_p.h"
 
 #include <wayland-server-protocol.h>
 
 #include <QtCore/QDebug>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 DataSource::DataSource(struct wl_client *client, uint32_t id, uint32_t time)
     : m_time(time)
@@ -130,3 +132,5 @@ void DataSource::setManager(DataDeviceManager *mgr)
 }
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wldatasource.h b/src/compositor/wayland_wrapper/qwldatasource_p.h
index 75e9bbdd6..be855d8da 100644
--- a/src/compositor/wayland_wrapper/wldatasource.h
+++ b/src/compositor/wayland_wrapper/qwldatasource_p.h
@@ -46,7 +46,9 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 class DataOffer;
 class DataDeviceManager;
@@ -87,4 +89,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLDATASOURCE_H
diff --git a/src/compositor/wayland_wrapper/wldisplay.cpp b/src/compositor/wayland_wrapper/qwldisplay.cpp
index e933e53e8..be5b54182 100644
--- a/src/compositor/wayland_wrapper/wldisplay.cpp
+++ b/src/compositor/wayland_wrapper/qwldisplay.cpp
@@ -38,13 +38,15 @@
 **
 ****************************************************************************/
 
-#include "wldisplay.h"
+#include "qwldisplay_p.h"
 
 #include <QtCore/QDebug>
 
 #include <wayland-server-protocol.h>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 Display::Display()
 {
@@ -60,3 +62,4 @@ Display::~Display()
 
 }
 
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wldisplay.h b/src/compositor/wayland_wrapper/qwldisplay_p.h
index 69cc93d07..f18cb1e6b 100644
--- a/src/compositor/wayland_wrapper/wldisplay.h
+++ b/src/compositor/wayland_wrapper/qwldisplay_p.h
@@ -42,8 +42,11 @@
 #define WL_DISPLAY_H
 
 #include <wayland-server.h>
+#include <QtCompositor/qwaylandexport.h>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 class Display
 {
@@ -60,4 +63,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif //WL_DISPLAY_H
diff --git a/src/compositor/wayland_wrapper/wlextendedoutput.cpp b/src/compositor/wayland_wrapper/qwlextendedoutput.cpp
index b9182011a..8249f2721 100644
--- a/src/compositor/wayland_wrapper/wlextendedoutput.cpp
+++ b/src/compositor/wayland_wrapper/qwlextendedoutput.cpp
@@ -38,13 +38,15 @@
 **
 ****************************************************************************/
 
-#include "wlextendedoutput.h"
+#include "qwlextendedoutput_p.h"
 
-#include "wlcompositor.h"
-#include "wlsurface.h"
-#include "wloutput.h"
+#include "qwlcompositor_p.h"
+#include "qwlsurface_p.h"
+#include "qwloutput_p.h"
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 OutputExtensionGlobal::OutputExtensionGlobal(Compositor *compositor)
     : m_compositor(compositor)
@@ -144,5 +146,6 @@ void ExtendedOutput::sendOutputOrientation(Qt::ScreenOrientation orientation)
     wl_extended_output_send_set_screen_rotation(m_extended_output_resource, sendOpperation);
 }
 
-
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlextendedoutput.h b/src/compositor/wayland_wrapper/qwlextendedoutput_p.h
index 0d24a9245..46c56beb8 100644
--- a/src/compositor/wayland_wrapper/wlextendedoutput.h
+++ b/src/compositor/wayland_wrapper/qwlextendedoutput_p.h
@@ -44,9 +44,13 @@
 #include "wayland-server.h"
 #include "wayland-output-extension-server-protocol.h"
 
+#include <QtCompositor/qwaylandexport.h>
+
 #include <QtCore/qnamespace.h>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 class Compositor;
 class Output;
@@ -93,4 +97,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLEXTENDEDOUTPUT_H
diff --git a/src/compositor/wayland_wrapper/wlextendedsurface.cpp b/src/compositor/wayland_wrapper/qwlextendedsurface.cpp
index 1ffb9c421..dd550af10 100644
--- a/src/compositor/wayland_wrapper/wlextendedsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlextendedsurface.cpp
@@ -38,12 +38,14 @@
 **
 ****************************************************************************/
 
-#include "wlextendedsurface.h"
+#include "qwlextendedsurface_p.h"
 
-#include "wlcompositor.h"
-#include "wlsurface.h"
+#include "qwlcompositor_p.h"
+#include "qwlsurface_p.h"
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 SurfaceExtensionGlobal::SurfaceExtensionGlobal(Compositor *compositor)
     : m_compositor(compositor)
@@ -155,7 +157,7 @@ void ExtendedSurface::set_content_orientation(struct wl_client *client,
         emit extended_surface->m_surface->waylandSurface()->contentOrientationChanged();
 }
 
-void ExtendedSurface::setWindowFlags(WaylandSurface::WindowFlags flags)
+void ExtendedSurface::setWindowFlags(QWaylandSurface::WindowFlags flags)
 {
     if (flags == m_windowFlags)
         return;
@@ -186,7 +188,7 @@ void ExtendedSurface::set_window_flags(wl_client *client, wl_resource *resource,
 {
     Q_UNUSED(client);
     ExtendedSurface *extended_surface = static_cast<ExtendedSurface *>(resource->data);
-    extended_surface->setWindowFlags(WaylandSurface::WindowFlags(flags));
+    extended_surface->setWindowFlags(QWaylandSurface::WindowFlags(flags));
 }
 
 const struct wl_extended_surface_interface ExtendedSurface::extended_surface_interface = {
@@ -196,3 +198,5 @@ const struct wl_extended_surface_interface ExtendedSurface::extended_surface_int
 };
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlextendedsurface.h b/src/compositor/wayland_wrapper/qwlextendedsurface_p.h
index bb3192248..6dc60efb0 100644
--- a/src/compositor/wayland_wrapper/wlextendedsurface.h
+++ b/src/compositor/wayland_wrapper/qwlextendedsurface_p.h
@@ -44,15 +44,17 @@
 #include <wayland-server.h>
 #include "wayland-surface-extension-server-protocol.h"
 
-#include "wlsurface.h"
-#include "waylandsurface.h"
+#include <private/qwlsurface_p.h>
+#include <QtCompositor/qwaylandsurface.h>
 
 #include <QtCore/QVariant>
 #include <QtCore/QLinkedList>
 
-class WaylandSurface;
+QT_BEGIN_NAMESPACE
 
-namespace Wayland {
+class QWaylandSurface;
+
+namespace QtWayland {
 
 class Compositor;
 
@@ -87,11 +89,11 @@ public:
     void removeSubSurface(ExtendedSurface *subSurfaces);
     ExtendedSurface *parent() const;
     void setParent(ExtendedSurface *parent);
-    QLinkedList<WaylandSurface *> subSurfaces() const;
+    QLinkedList<QWaylandSurface *> subSurfaces() const;
 
     Qt::ScreenOrientation contentOrientation() const;
 
-    WaylandSurface::WindowFlags windowFlags() const { return m_windowFlags; }
+    QWaylandSurface::WindowFlags windowFlags() const { return m_windowFlags; }
 
     qint64 processId() const;
     void setProcessId(qint64 processId);
@@ -106,7 +108,7 @@ private:
 
     Qt::ScreenOrientation m_contentOrientation;
 
-    WaylandSurface::WindowFlags m_windowFlags;
+    QWaylandSurface::WindowFlags m_windowFlags;
 
     QByteArray m_authenticationToken;
     QVariantMap m_windowProperties;
@@ -124,11 +126,13 @@ private:
     static void set_window_flags(struct wl_client *client,
                                  struct wl_resource *resource,
                                  int32_t flags);
-    void setWindowFlags(WaylandSurface::WindowFlags flags);
+    void setWindowFlags(QWaylandSurface::WindowFlags flags);
 
     static const struct wl_extended_surface_interface extended_surface_interface;
 };
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLEXTENDEDSURFACE_H
diff --git a/src/compositor/wayland_wrapper/wlinputdevice.cpp b/src/compositor/wayland_wrapper/qwlinputdevice.cpp
index 6b8f36409..8591de254 100644
--- a/src/compositor/wayland_wrapper/wlinputdevice.cpp
+++ b/src/compositor/wayland_wrapper/qwlinputdevice.cpp
@@ -38,14 +38,14 @@
 **
 ****************************************************************************/
 
-#include "wlinputdevice.h"
+#include "qwlinputdevice_p.h"
 
-#include "wlcompositor.h"
-#include "wldatadevice.h"
-#include "wlsurface.h"
-#include "wltouch.h"
-#include "wlqtkey.h"
-#include "waylandcompositor.h"
+#include "qwlcompositor_p.h"
+#include "qwldatadevice_p.h"
+#include "qwlsurface_p.h"
+#include "qwltouch_p.h"
+#include "qwlqtkey_p.h"
+#include "qwaylandcompositor.h"
 
 #include <QtGui/QTouchEvent>
 
@@ -60,9 +60,11 @@
 #include <stdlib.h>
 #endif
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
 
-InputDevice::InputDevice(WaylandInputDevice *handle, Compositor *compositor)
+namespace QtWayland {
+
+InputDevice::InputDevice(QWaylandInputDevice *handle, Compositor *compositor)
     : m_handle(handle)
     , m_compositor(compositor)
 {
@@ -245,7 +247,7 @@ void InputDevice::set_cursor(wl_client *client, wl_resource *resource,
 
     wl_pointer *pointer = reinterpret_cast<wl_pointer *>(resource->data);
     InputDevice *inputDevice = wayland_cast<InputDevice>(pointer->seat);
-    Wayland::Surface *surface = reinterpret_cast<Wayland::Surface *>(surface_resource->data);
+    QtWayland::Surface *surface = reinterpret_cast<QtWayland::Surface *>(surface_resource->data);
 
     surface->setCursorSurface(true);
     inputDevice->m_compositor->waylandCompositor()->setCursorSurface(surface->waylandSurface(), hotspot_x, hotspot_y);
@@ -599,7 +601,7 @@ Compositor *InputDevice::compositor() const
     return m_compositor;
 }
 
-WaylandInputDevice *InputDevice::handle() const
+QWaylandInputDevice *InputDevice::handle() const
 {
     return m_handle;
 }
@@ -644,3 +646,5 @@ DataDevice *InputDevice::dataDevice(struct wl_client *client) const
 }
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlinputdevice.h b/src/compositor/wayland_wrapper/qwlinputdevice_p.h
index afd7ff51d..9365fa9de 100644
--- a/src/compositor/wayland_wrapper/wlinputdevice.h
+++ b/src/compositor/wayland_wrapper/qwlinputdevice_p.h
@@ -41,7 +41,7 @@
 #ifndef WLINPUTDEVICE_H
 #define WLINPUTDEVICE_H
 
-#include "waylandobject.h"
+#include <QtCompositor/qwaylandobject.h>
 
 #include <stdint.h>
 
@@ -52,11 +52,13 @@
 #include <xkbcommon/xkbcommon.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+
 class QKeyEvent;
 class QTouchEvent;
-class WaylandInputDevice;
+class QWaylandInputDevice;
 
-namespace Wayland {
+namespace QtWayland {
 
 class Compositor;
 class DataDevice;
@@ -66,7 +68,7 @@ class DataDeviceManager;
 class InputDevice : public Object<struct wl_seat>
 {
 public:
-    InputDevice(WaylandInputDevice *handle, Compositor *compositor);
+    InputDevice(QWaylandInputDevice *handle, Compositor *compositor);
     ~InputDevice();
 
     void sendMousePressEvent(Qt::MouseButton button, const QPointF &localPos, const QPointF &globalPos = QPointF());
@@ -96,7 +98,7 @@ public:
     void sendSelectionFocus(Surface *surface);
 
     Compositor *compositor() const;
-    WaylandInputDevice *handle() const;
+    QWaylandInputDevice *handle() const;
 
     wl_pointer *pointerDevice();
     wl_keyboard *keyboardDevice();
@@ -112,7 +114,7 @@ private:
     void updateModifierState(uint key, int state);
     void sendKeyModifiers(wl_resource *resource);
 
-    WaylandInputDevice *m_handle;
+    QWaylandInputDevice *m_handle;
     Compositor *m_compositor;
     QList<DataDevice *> m_data_devices;
     struct {
@@ -159,4 +161,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLINPUTDEVICE_H
diff --git a/src/compositor/wayland_wrapper/wloutput.cpp b/src/compositor/wayland_wrapper/qwloutput.cpp
index 33e86eee4..f248dccdb 100644
--- a/src/compositor/wayland_wrapper/wloutput.cpp
+++ b/src/compositor/wayland_wrapper/qwloutput.cpp
@@ -38,13 +38,15 @@
 **
 ****************************************************************************/
 
-#include "wloutput.h"
-#include "wlextendedoutput.h"
+#include "qwloutput_p.h"
+#include "qwlextendedoutput_p.h"
 #include <QGuiApplication>
 #include <QtGui/QScreen>
 #include <QRect>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 OutputGlobal::OutputGlobal()
     : m_displayId(-1)
@@ -122,3 +124,5 @@ wl_resource *Output::handle() const
 }
 
 } // namespace Wayland
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wloutput.h b/src/compositor/wayland_wrapper/qwloutput_p.h
index 8baf545f8..11341737d 100644
--- a/src/compositor/wayland_wrapper/wloutput.h
+++ b/src/compositor/wayland_wrapper/qwloutput_p.h
@@ -41,12 +41,14 @@
 #ifndef WL_OUTPUT_H
 #define WL_OUTPUT_H
 
-#include "waylandresourcecollection.h"
+#include <QtCompositor/qwaylandresourcecollection.h>
 
 #include <QtCore/QRect>
 #include <QtCore/QList>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 class Output;
 class ExtendedOutput;
@@ -101,4 +103,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif //WL_OUTPUT_H
diff --git a/src/compositor/wayland_wrapper/wlqtkey.cpp b/src/compositor/wayland_wrapper/qwlqtkey.cpp
index a4948924b..a6fea9f2a 100644
--- a/src/compositor/wayland_wrapper/wlqtkey.cpp
+++ b/src/compositor/wayland_wrapper/qwlqtkey.cpp
@@ -38,12 +38,14 @@
 **
 ****************************************************************************/
 
-#include "wlqtkey.h"
-#include "wlsurface.h"
+#include "qwlqtkey_p.h"
+#include "qwlsurface_p.h"
 #include <QKeyEvent>
 #include <QWindow>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 static void dummy(wl_client *, wl_resource *)
 {
@@ -111,3 +113,5 @@ bool QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, Surface *surface)
 }
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlqtkey.h b/src/compositor/wayland_wrapper/qwlqtkey_p.h
index d44e7c1bf..bb98f9b88 100644
--- a/src/compositor/wayland_wrapper/wlqtkey.h
+++ b/src/compositor/wayland_wrapper/qwlqtkey_p.h
@@ -41,15 +41,17 @@
 #ifndef WLQTKEY_H
 #define WLQTKEY_H
 
-#include "wlcompositor.h"
+#include  <private/qwlcompositor_p.h>
 #include "wayland-qtkey-extension-server-protocol.h"
 #include "wayland-util.h"
 
+QT_BEGIN_NAMESPACE
+
 class Compositor;
 class Surface;
 class QKeyEvent;
 
-namespace Wayland {
+namespace QtWayland {
 
 class QtKeyExtensionGlobal
 {
@@ -73,4 +75,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLQTKEY_H
diff --git a/src/compositor/wayland_wrapper/wlregion.cpp b/src/compositor/wayland_wrapper/qwlregion.cpp
index c4adcae49..c9e452528 100644
--- a/src/compositor/wayland_wrapper/wlregion.cpp
+++ b/src/compositor/wayland_wrapper/qwlregion.cpp
@@ -38,11 +38,13 @@
 **
 ****************************************************************************/
 
-#include "wlregion.h"
+#include "qwlregion_p.h"
 
-#include "wlcompositor.h"
+#include "qwlcompositor_p.h"
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 void destroy_region(struct wl_resource *resource)
 {
@@ -87,4 +89,4 @@ void Region::region_subtract(wl_client *client, wl_resource *region,
 
 }
 
-
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlregion.h b/src/compositor/wayland_wrapper/qwlregion_p.h
index 80a48ab1f..2002e7370 100644
--- a/src/compositor/wayland_wrapper/wlregion.h
+++ b/src/compositor/wayland_wrapper/qwlregion_p.h
@@ -41,14 +41,16 @@
 #ifndef WL_REGION_H
 #define WL_REGION_H
 
-#include "waylandexport.h"
-#include "waylandobject.h"
+#include <QtCompositor/qwaylandexport.h>
+#include <QtCompositor/qwaylandobject.h>
 
 #include <QRegion>
 
 #include <wayland-util.h>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 class Q_COMPOSITOR_EXPORT Region : public Object<wl_resource>
 {
@@ -76,5 +78,7 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WL_REGION_H
 
diff --git a/src/compositor/wayland_wrapper/wlshellsurface.cpp b/src/compositor/wayland_wrapper/qwlshellsurface.cpp
index aed1ee64f..f8d6e0c5c 100644
--- a/src/compositor/wayland_wrapper/wlshellsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlshellsurface.cpp
@@ -38,17 +38,19 @@
 **
 ****************************************************************************/
 
-#include "wlshellsurface.h"
+#include "qwlshellsurface_p.h"
 
-#include "wlcompositor.h"
-#include "wlsurface.h"
-#include "wlinputdevice.h"
-#include "wlsubsurface.h"
+#include "qwlcompositor_p.h"
+#include "qwlsurface_p.h"
+#include "qwlinputdevice_p.h"
+#include "qwlsubsurface_p.h"
 
 #include <QtCore/qglobal.h>
 #include <QtCore/QDebug>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 Shell::Shell()
 {
@@ -471,3 +473,5 @@ const struct wl_pointer_grab_interface ShellSurfaceMoveGrabber::move_grabber_int
 };
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlshellsurface.h b/src/compositor/wayland_wrapper/qwlshellsurface_p.h
index e3a4713f1..1bb0c4e42 100644
--- a/src/compositor/wayland_wrapper/wlshellsurface.h
+++ b/src/compositor/wayland_wrapper/qwlshellsurface_p.h
@@ -41,12 +41,14 @@
 #ifndef WLSHELLSURFACE_H
 #define WLSHELLSURFACE_H
 
-#include "waylandobject.h"
+#include <QtCompositor/qwaylandobject.h>
 
 #include <wayland-server.h>
 #include <QPoint>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 class Compositor;
 class Surface;
@@ -193,8 +195,8 @@ public:
     static const struct wl_pointer_grab_interface move_grabber_interface;
 };
 
-
-
 }
 
+QT_END_NAMESPACE
+
 #endif // WLSHELLSURFACE_H
diff --git a/src/compositor/wayland_wrapper/wlsubsurface.cpp b/src/compositor/wayland_wrapper/qwlsubsurface.cpp
index c6013b65a..f482cde6d 100644
--- a/src/compositor/wayland_wrapper/wlsubsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsubsurface.cpp
@@ -38,12 +38,14 @@
 **
 ****************************************************************************/
 
-#include "wlsubsurface.h"
+#include "qwlsubsurface_p.h"
 
-#include "wlcompositor.h"
-#include "waylandsurface.h"
+#include "qwlcompositor_p.h"
+#include "qwaylandsurface.h"
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 SubSurfaceExtensionGlobal::SubSurfaceExtensionGlobal(Compositor *compositor)
     : m_compositor(compositor)
@@ -88,7 +90,7 @@ SubSurface::~SubSurface()
     if (m_parent) {
         m_parent->removeSubSurface(this);
     }
-    QLinkedList<WaylandSurface *>::iterator it;
+    QLinkedList<QWaylandSurface *>::iterator it;
     for (it = m_sub_surfaces.begin(); it != m_sub_surfaces.end(); ++it) {
         (*it)->handle()->subSurface()->parentDestroyed();
     }
@@ -119,8 +121,8 @@ void SubSurface::setParent(SubSurface *parent)
     if (m_parent == parent)
         return;
 
-    WaylandSurface *oldParent = 0;
-    WaylandSurface *newParent = 0;
+    QWaylandSurface *oldParent = 0;
+    QWaylandSurface *newParent = 0;
 
     if (m_parent) {
         oldParent = m_parent->m_surface->waylandSurface();
@@ -134,7 +136,7 @@ void SubSurface::setParent(SubSurface *parent)
     m_surface->waylandSurface()->parentChanged(newParent,oldParent);
 }
 
-QLinkedList<WaylandSurface *> SubSurface::subSurfaces() const
+QLinkedList<QWaylandSurface *> SubSurface::subSurfaces() const
 {
     return m_sub_surfaces;
 }
@@ -184,3 +186,5 @@ const struct wl_sub_surface_interface SubSurface::sub_surface_interface = {
 };
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlsubsurface.h b/src/compositor/wayland_wrapper/qwlsubsurface_p.h
index 6c7ede04e..4fb80d611 100644
--- a/src/compositor/wayland_wrapper/wlsubsurface.h
+++ b/src/compositor/wayland_wrapper/qwlsubsurface_p.h
@@ -41,16 +41,18 @@
 #ifndef WLSUBSURFACE_H
 #define WLSUBSURFACE_H
 
-#include "wlsurface.h"
+#include <private/qwlsurface_p.h>
 
 #include "wayland-sub-surface-extension-server-protocol.h"
 
 #include <QtCore/QLinkedList>
 
+QT_BEGIN_NAMESPACE
+
 class Compositor;
-class WaylandSurface;
+class QWaylandSurface;
 
-namespace Wayland {
+namespace QtWayland {
 
 class SubSurfaceExtensionGlobal
 {
@@ -82,10 +84,10 @@ public:
     SubSurface *parent() const;
     void setParent(SubSurface *parent);
 
-    QLinkedList<WaylandSurface *> subSurfaces() const;
+    QLinkedList<QWaylandSurface *> subSurfaces() const;
 
     Surface *surface() const;
-    WaylandSurface *waylandSurface() const;
+    QWaylandSurface *waylandSurface() const;
 
 private:
     void parentDestroyed();
@@ -93,7 +95,7 @@ private:
     Surface *m_surface;
 
     SubSurface *m_parent;
-    QLinkedList<WaylandSurface *> m_sub_surfaces;
+    QLinkedList<QWaylandSurface *> m_sub_surfaces;
 
     static void attach_sub_surface(struct wl_client *client,
                                    struct wl_resource *sub_surface_parent_resource,
@@ -119,12 +121,13 @@ inline Surface *SubSurface::surface() const
     return m_surface;
 }
 
-inline WaylandSurface *SubSurface::waylandSurface() const
+inline QWaylandSurface *SubSurface::waylandSurface() const
 {
     return m_surface->waylandSurface();
 }
 
-
 }
 
+QT_END_NAMESPACE
+
 #endif // WLSUBSURFACE_H
diff --git a/src/compositor/wayland_wrapper/wlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp
index 6781f29b9..e61b30fc1 100644
--- a/src/compositor/wayland_wrapper/wlsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurface.cpp
@@ -38,20 +38,20 @@
 **
 ****************************************************************************/
 
-#include "wlsurface.h"
+#include "qwlsurface_p.h"
 
-#include "waylandsurface.h"
+#include "qwaylandsurface.h"
 #ifdef QT_COMPOSITOR_QUICK
-#include "waylandsurfaceitem.h"
+#include "qwaylandsurfaceitem.h"
 #endif
 
-#include "wlcompositor.h"
-#include "wlinputdevice.h"
-#include "wlextendedsurface.h"
-#include "wlregion.h"
-#include "wlsubsurface.h"
-#include "wlsurfacebuffer.h"
-#include "wlshellsurface.h"
+#include "qwlcompositor_p.h"
+#include "qwlinputdevice_p.h"
+#include "qwlextendedsurface_p.h"
+#include "qwlregion_p.h"
+#include "qwlsubsurface_p.h"
+#include "qwlsurfacebuffer_p.h"
+#include "qwlshellsurface_p.h"
 
 #include <QtCore/QDebug>
 #include <QTouchEvent>
@@ -59,7 +59,7 @@
 #include <wayland-server.h>
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include "hardware_integration/graphicshardwareintegration.h"
+#include "hardware_integration/qwaylandgraphicshardwareintegration.h"
 #include <qpa/qplatformopenglcontext.h>
 #endif
 
@@ -67,7 +67,9 @@
 #include "waylandwindowmanagerintegration.h"
 #endif
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 void destroy_surface(struct wl_resource *resource)
 {
@@ -78,7 +80,7 @@ void destroy_surface(struct wl_resource *resource)
 
 Surface::Surface(struct wl_client *client, uint32_t id, Compositor *compositor)
     : m_compositor(compositor)
-    , m_waylandSurface(new WaylandSurface(this))
+    , m_waylandSurface(new QWaylandSurface(this))
     , m_backBuffer(0)
     , m_frontBuffer(0)
     , m_surfaceMapped(false)
@@ -109,30 +111,30 @@ Surface::~Surface()
     }
 }
 
-WaylandSurface::Type Surface::type() const
+QWaylandSurface::Type Surface::type() const
 {
     SurfaceBuffer *surfaceBuffer = currentSurfaceBuffer();
     if (surfaceBuffer && surfaceBuffer->waylandBufferHandle()) {
         if (surfaceBuffer->isShmBuffer()) {
-            return WaylandSurface::Shm;
+            return QWaylandSurface::Shm;
         } else {
-            return WaylandSurface::Texture;
+            return QWaylandSurface::Texture;
         }
     }
-    return WaylandSurface::Invalid;
+    return QWaylandSurface::Invalid;
 }
 
 bool Surface::isYInverted() const
 {
     bool ret = false;
     static bool negateReturn = qgetenv("QT_COMPOSITOR_NEGATE_INVERTED_Y").toInt();
-    GraphicsHardwareIntegration *graphicsHWIntegration = m_compositor->graphicsHWIntegration();
+    QWaylandGraphicsHardwareIntegration *graphicsHWIntegration = m_compositor->graphicsHWIntegration();
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
     SurfaceBuffer *surfacebuffer = currentSurfaceBuffer();
     if (!surfacebuffer) {
         ret = false;
-    } else if (graphicsHWIntegration && surfacebuffer->waylandBufferHandle() && type() != WaylandSurface::Shm) {
+    } else if (graphicsHWIntegration && surfacebuffer->waylandBufferHandle() && type() != QWaylandSurface::Shm) {
         ret = graphicsHWIntegration->isYInverted(surfacebuffer->waylandBufferHandle());
     } else
 #endif
@@ -197,7 +199,7 @@ QRegion Surface::opaqueRegion() const
 QImage Surface::image() const
 {
     SurfaceBuffer *surfacebuffer = currentSurfaceBuffer();
-    if (surfacebuffer && !surfacebuffer->isDestroyed() && type() == WaylandSurface::Shm) {
+    if (surfacebuffer && !surfacebuffer->isDestroyed() && type() == QWaylandSurface::Shm) {
         struct wl_buffer *buffer = surfacebuffer->waylandBufferHandle();
         int stride = wl_shm_buffer_get_stride(buffer);
         uint format = wl_shm_buffer_get_format(buffer);
@@ -215,9 +217,9 @@ GLuint Surface::textureId(QOpenGLContext *context) const
 {
     const SurfaceBuffer *surfacebuffer = currentSurfaceBuffer();
 
-    if (m_compositor->graphicsHWIntegration() && type() == WaylandSurface::Texture
+    if (m_compositor->graphicsHWIntegration() && type() == QWaylandSurface::Texture
          && !surfacebuffer->textureCreated()) {
-        GraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
+        QWaylandGraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
         const_cast<SurfaceBuffer *>(surfacebuffer)->createTexture(hwIntegration,context);
     }
     return surfacebuffer->texture();
@@ -253,7 +255,7 @@ void Surface::frameFinished()
     m_compositor->frameFinished(this);
 }
 
-WaylandSurface * Surface::waylandSurface() const
+QWaylandSurface * Surface::waylandSurface() const
 {
     return m_waylandSurface;
 }
@@ -349,7 +351,7 @@ bool Surface::advanceBufferQueue()
 void Surface::doUpdate() {
     if (postBuffer()) {
 #ifdef QT_COMPOSITOR_QUICK
-        WaylandSurfaceItem *surfaceItem = waylandSurface()->surfaceItem();
+        QWaylandSurfaceItem *surfaceItem = waylandSurface()->surfaceItem();
         if (surfaceItem)
             surfaceItem->setDamagedFlag(true); // avoid flicker when we switch back to composited mode
 #endif
@@ -520,3 +522,4 @@ void Surface::setTitle(const QString &title)
 
 } // namespace Wayland
 
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlsurface.h b/src/compositor/wayland_wrapper/qwlsurface_p.h
index 5c11c6bc4..21b1ae742 100644
--- a/src/compositor/wayland_wrapper/wlsurface.h
+++ b/src/compositor/wayland_wrapper/qwlsurface_p.h
@@ -41,12 +41,12 @@
 #ifndef WL_SURFACE_H
 #define WL_SURFACE_H
 
-#include "waylandexport.h"
+#include <QtCompositor/qwaylandexport.h>
 
-#include "wlsurfacebuffer.h"
-#include "waylandsurface.h"
+#include <private/qwlsurfacebuffer_p.h>
+#include <QtCompositor/qwaylandsurface.h>
 
-#include "waylandobject.h"
+#include <QtCompositor/qwaylandobject.h>
 
 #include <QtCore/QRect>
 #include <QtGui/QImage>
@@ -61,9 +61,11 @@
 
 #include <wayland-util.h>
 
+QT_BEGIN_NAMESPACE
+
 class QTouchEvent;
 
-namespace Wayland {
+namespace QtWayland {
 
 class Compositor;
 class Buffer;
@@ -77,7 +79,7 @@ public:
     Surface(struct wl_client *client, uint32_t id, Compositor *compositor);
     ~Surface();
 
-    WaylandSurface::Type type() const;
+    QWaylandSurface::Type type() const;
     bool isYInverted() const;
 
     bool visible() const;
@@ -104,7 +106,7 @@ public:
 
     void frameFinished();
 
-    WaylandSurface *waylandSurface() const;
+    QWaylandSurface *waylandSurface() const;
 
     QPoint lastMousePos() const;
 
@@ -139,7 +141,7 @@ private:
     Q_DISABLE_COPY(Surface)
 
     Compositor *m_compositor;
-    WaylandSurface *m_waylandSurface;
+    QWaylandSurface *m_waylandSurface;
 
     SurfaceBuffer *m_backBuffer;
     SurfaceBuffer *m_frontBuffer;
@@ -199,4 +201,6 @@ inline SurfaceBuffer *Surface::currentSurfaceBuffer() const {
 
 }
 
+QT_END_NAMESPACE
+
 #endif //WL_SURFACE_H
diff --git a/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
index 6dd76532c..cebe105b8 100644
--- a/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
@@ -38,19 +38,21 @@
 **
 ****************************************************************************/
 
-#include "wlsurfacebuffer.h"
+#include "qwlsurfacebuffer_p.h"
 
-#include "wlsurface.h"
-#include "wlcompositor.h"
+#include "qwlsurface_p.h"
+#include "qwlcompositor_p.h"
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include "hardware_integration/graphicshardwareintegration.h"
+#include "hardware_integration/qwaylandgraphicshardwareintegration.h"
 #include <qpa/qplatformopenglcontext.h>
 #endif
 
 #include <QtCore/QDebug>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 SurfaceBuffer::SurfaceBuffer(Surface *surface)
     : QPlatformScreenBuffer()
@@ -106,7 +108,7 @@ void SurfaceBuffer::destructBufferState()
                 delete static_cast<QImage *>(m_handle);
 #ifdef QT_COMPOSITOR_WAYLAND_GL
             } else {
-                GraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
+                QWaylandGraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
                 hwIntegration->unlockNativeBuffer(m_handle, m_compositor->directRenderContext());
 #endif
             }
@@ -217,7 +219,7 @@ void *SurfaceBuffer::handle() const
             that->m_handle = image;
 #ifdef QT_COMPOSITOR_WAYLAND_GL
         } else {
-            GraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
+            QWaylandGraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
             that->m_handle = hwIntegration->lockNativeBuffer(m_buffer, m_compositor->directRenderContext());
 #endif
         }
@@ -241,7 +243,7 @@ void freeTexture(QOpenGLFunctions *, GLuint id)
     glDeleteTextures(1, &id);
 }
 
-void SurfaceBuffer::createTexture(GraphicsHardwareIntegration *hwIntegration, QOpenGLContext *context)
+void SurfaceBuffer::createTexture(QWaylandGraphicsHardwareIntegration *hwIntegration, QOpenGLContext *context)
 {
 #ifdef QT_COMPOSITOR_WAYLAND_GL
     m_texture = hwIntegration->createTextureFromBuffer(m_buffer, context);
@@ -253,3 +255,5 @@ void SurfaceBuffer::createTexture(GraphicsHardwareIntegration *hwIntegration, QO
 }
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wlsurfacebuffer.h b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
index 8efab29c8..dda335444 100644
--- a/src/compositor/wayland_wrapper/wlsurfacebuffer.h
+++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
@@ -48,10 +48,12 @@
 
 #include <wayland-server.h>
 
-class GraphicsHardwareIntegration;
+QT_BEGIN_NAMESPACE
+
+class QWaylandGraphicsHardwareIntegration;
 class QOpenGLContext;
 
-namespace Wayland {
+namespace QtWayland {
 
 class Surface;
 class Compositor;
@@ -95,7 +97,7 @@ public:
 
     inline bool textureCreated() const { return m_texture; }
 
-    void createTexture(GraphicsHardwareIntegration *hwIntegration, QOpenGLContext *context);
+    void createTexture(QWaylandGraphicsHardwareIntegration *hwIntegration, QOpenGLContext *context);
     inline GLuint texture() const;
     void destroyTexture();
 
@@ -139,4 +141,6 @@ GLuint SurfaceBuffer::texture() const
 
 }
 
+QT_END_NAMESPACE
+
 #endif // SURFACEBUFFER_H
diff --git a/src/compositor/wayland_wrapper/wltouch.cpp b/src/compositor/wayland_wrapper/qwltouch.cpp
index 67efc110e..458c74bf9 100644
--- a/src/compositor/wayland_wrapper/wltouch.cpp
+++ b/src/compositor/wayland_wrapper/qwltouch.cpp
@@ -38,12 +38,14 @@
 **
 ****************************************************************************/
 
-#include "wltouch.h"
-#include "wlsurface.h"
+#include "qwltouch_p.h"
+#include "qwlsurface_p.h"
 #include <QTouchEvent>
 #include <QWindow>
 
-namespace Wayland {
+QT_BEGIN_NAMESPACE
+
+namespace QtWayland {
 
 static void dummy(wl_client *, wl_resource *)
 {
@@ -174,3 +176,5 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, Surface *surface)
 }
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/wltouch.h b/src/compositor/wayland_wrapper/qwltouch_p.h
index 8a4eba008..09c9a0898 100644
--- a/src/compositor/wayland_wrapper/wltouch.h
+++ b/src/compositor/wayland_wrapper/qwltouch_p.h
@@ -41,15 +41,17 @@
 #ifndef WLTOUCH_H
 #define WLTOUCH_H
 
-#include "wlcompositor.h"
+#include <private/qwlcompositor_p.h>
 #include "wayland-touch-extension-server-protocol.h"
 #include "wayland-util.h"
 
+QT_BEGIN_NAMESPACE
+
 class Compositor;
 class Surface;
 class QTouchEvent;
 
-namespace Wayland {
+namespace QtWayland {
 
 class TouchExtensionGlobal
 {
@@ -78,4 +80,6 @@ private:
 
 }
 
+QT_END_NAMESPACE
+
 #endif // WLTOUCH_H
diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri
index 84008c6c2..9bfe957e2 100644
--- a/src/compositor/wayland_wrapper/wayland_wrapper.pri
+++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri
@@ -1,53 +1,50 @@
 WAYLANDSOURCES += \
-                $$PWD/../../extensions/surface-extension.xml \
-                $$PWD/../../extensions/sub-surface-extension.xml \
-                $$PWD/../../extensions/output-extension.xml \
-                $$PWD/../../extensions/touch-extension.xml \
-                $$PWD/../../extensions/qtkey-extension.xml
-
+    ../extensions/surface-extension.xml \
+    ../extensions/sub-surface-extension.xml \
+    ../extensions/output-extension.xml \
+    ../extensions/touch-extension.xml \
+    ../extensions/qtkey-extension.xml \
+    ../extensions/windowmanager.xml
 
 HEADERS += \
-    $$PWD/wlcompositor.h \
-    $$PWD/wldisplay.h \
-    $$PWD/wloutput.h \
-    $$PWD/wlsurface.h \
-    $$PWD/wlshellsurface.h \
-    $$PWD/wlinputdevice.h \
-    $$PWD/wldatadevicemanager.h \
-    $$PWD/wldatadevice.h \
-    $$PWD/wldataoffer.h \
-    $$PWD/wldatasource.h \
-    $$PWD/wlextendedsurface.h \
-    $$PWD/wlextendedoutput.h \
-    $$PWD/wlsubsurface.h \
-    $$PWD/wltouch.h \
-    $$PWD/wlqtkey.h \
-    $$PWD/../../shared/qwaylandmimehelper.h \
-    $$PWD/wlsurfacebuffer.h \
-    $$PWD/wlregion.h
+    wayland_wrapper/qwlcompositor_p.h \
+    wayland_wrapper/qwldatadevice_p.h \
+    wayland_wrapper/qwldatadevicemanager_p.h \
+    wayland_wrapper/qwldataoffer_p.h \
+    wayland_wrapper/qwldatasource_p.h \
+    wayland_wrapper/qwldisplay_p.h \
+    wayland_wrapper/qwlextendedoutput_p.h \
+    wayland_wrapper/qwlextendedsurface_p.h \
+    wayland_wrapper/qwlinputdevice_p.h \
+    wayland_wrapper/qwloutput_p.h \
+    wayland_wrapper/qwlqtkey_p.h \
+    wayland_wrapper/qwlregion_p.h \
+    wayland_wrapper/qwlshellsurface_p.h \
+    wayland_wrapper/qwlsubsurface_p.h \
+    wayland_wrapper/qwlsurface_p.h \
+    wayland_wrapper/qwlsurfacebuffer_p.h \
+    wayland_wrapper/qwltouch_p.h
 
 SOURCES += \
-    $$PWD/wlcompositor.cpp \
-    $$PWD/wldisplay.cpp \
-    $$PWD/wloutput.cpp \
-    $$PWD/wlsurface.cpp \
-    $$PWD/wlshellsurface.cpp \
-    $$PWD/wlinputdevice.cpp \
-    $$PWD/wldatadevicemanager.cpp \
-    $$PWD/wldatadevice.cpp \
-    $$PWD/wldataoffer.cpp \
-    $$PWD/wldatasource.cpp \
-    $$PWD/wlextendedsurface.cpp \
-    $$PWD/wlextendedoutput.cpp \
-    $$PWD/wlsubsurface.cpp \
-    $$PWD/wltouch.cpp \
-    $$PWD/wlqtkey.cpp \
-    $$PWD/../../shared/qwaylandmimehelper.cpp \
-    $$PWD/wlsurfacebuffer.cpp \
-    $$PWD/wlregion.cpp
+    wayland_wrapper/qwlcompositor.cpp \
+    wayland_wrapper/qwldatadevice.cpp \
+    wayland_wrapper/qwldatadevicemanager.cpp \
+    wayland_wrapper/qwldataoffer.cpp \
+    wayland_wrapper/qwldatasource.cpp \
+    wayland_wrapper/qwldisplay.cpp \
+    wayland_wrapper/qwlextendedoutput.cpp \
+    wayland_wrapper/qwlextendedsurface.cpp \
+    wayland_wrapper/qwlinputdevice.cpp \
+    wayland_wrapper/qwloutput.cpp \
+    wayland_wrapper/qwlqtkey.cpp \
+    wayland_wrapper/qwlregion.cpp \
+    wayland_wrapper/qwlshellsurface.cpp \
+    wayland_wrapper/qwlsubsurface.cpp \
+    wayland_wrapper/qwlsurface.cpp \
+    wayland_wrapper/qwlsurfacebuffer.cpp \
+    wayland_wrapper/qwltouch.cpp
 
-INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../shared
+INCLUDEPATH += wayland_wrapper
 
 config_xkbcommon {
     !contains(QT_CONFIG, no-pkg-config) {