diff --git a/src/wayland/appmenu_interface.h b/src/wayland/appmenu_interface.h
index 4213650057..5548ad6c4a 100644
--- a/src/wayland/appmenu_interface.h
+++ b/src/wayland/appmenu_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_APPMENU_H
-#define KWAYLAND_SERVER_APPMENU_H
+#ifndef KWAYLAND_SERVER_APPMENU_INTERFACE_H
+#define KWAYLAND_SERVER_APPMENU_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/autotests/client/test_wayland_outputdevice.cpp b/src/wayland/autotests/client/test_wayland_outputdevice.cpp
index a21f1794c5..f84559cfa9 100644
--- a/src/wayland/autotests/client/test_wayland_outputdevice.cpp
+++ b/src/wayland/autotests/client/test_wayland_outputdevice.cpp
@@ -372,7 +372,7 @@ void TestWaylandOutputDevice::testScaleChange_legacy()
     m_serverOutputDevice->setScale(2);
     QVERIFY(outputChanged.wait());
     QCOMPARE(output.scale(), 2);
-    QCOMPARE(output.scaleF(), 2.0); //check we're forward compatiable
+    QCOMPARE(output.scaleF(), 2.0); //check we're forward compatible
 
 
     // change once more
diff --git a/src/wayland/autotests/client/test_wayland_outputmanagement.cpp b/src/wayland/autotests/client/test_wayland_outputmanagement.cpp
index 2eb723f1be..46b915d423 100644
--- a/src/wayland/autotests/client/test_wayland_outputmanagement.cpp
+++ b/src/wayland/autotests/client/test_wayland_outputmanagement.cpp
@@ -479,7 +479,7 @@ void TestWaylandOutputManagement::testConfigFailed()
 
     QVERIFY(serverApplySpy.wait(200));
 
-    // Artificialy make the server fail to apply the settings
+    // Artificially make the server fail to apply the settings
     // Make sure the applied signal never comes, and that failed has been received
     QVERIFY(!configAppliedSpy.wait(200));
     QCOMPARE(configFailedSpy.count(), 1);
diff --git a/src/wayland/autotests/client/test_wayland_seat.cpp b/src/wayland/autotests/client/test_wayland_seat.cpp
index b769a5d919..d07f1a13fc 100644
--- a/src/wayland/autotests/client/test_wayland_seat.cpp
+++ b/src/wayland/autotests/client/test_wayland_seat.cpp
@@ -1820,7 +1820,7 @@ void TestWaylandSeat::testSelection()
     // setting the same again should not change
     m_seatInterface->setSelection(ddi);
     QVERIFY(!selectionSpy.wait(100));
-    // now clear it manully
+    // now clear it manually
     m_seatInterface->setSelection(nullptr);
     QVERIFY(selectionClearedSpy.wait());
     QCOMPARE(selectionSpy.count(), 2);
diff --git a/src/wayland/autotests/client/test_wayland_windowmanagement.cpp b/src/wayland/autotests/client/test_wayland_windowmanagement.cpp
index 353d3ae392..58f9c8a066 100644
--- a/src/wayland/autotests/client/test_wayland_windowmanagement.cpp
+++ b/src/wayland/autotests/client/test_wayland_windowmanagement.cpp
@@ -27,7 +27,6 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../src/client/registry.h"
 #include "../../src/client/surface.h"
 #include "../../src/client/plasmawindowmanagement.h"
-#include "../../src/client/surface.h"
 #include "../../src/server/display.h"
 #include "../../src/server/compositor_interface.h"
 #include "../../src/server/region_interface.h"
diff --git a/src/wayland/autotests/client/test_xdg_shell.h b/src/wayland/autotests/client/test_xdg_shell.h
index 0f8e977940..3ed3b63d8e 100644
--- a/src/wayland/autotests/client/test_xdg_shell.h
+++ b/src/wayland/autotests/client/test_xdg_shell.h
@@ -17,6 +17,9 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
+#ifndef TEST_XDG_SHELL_H
+#define TEST_XDG_SHELL_H
+
 // Qt
 #include <QtTest/QtTest>
 // client
@@ -99,3 +102,5 @@ private:
     QVERIFY(xdgSurfaceCreatedSpy.wait()); \
     auto serverXdgSurface = xdgSurfaceCreatedSpy.first().first().value<XdgShellSurfaceInterface*>(); \
     QVERIFY(serverXdgSurface);
+
+#endif
diff --git a/src/wayland/idle_interface.h b/src/wayland/idle_interface.h
index 15bb0a5068..c26acb11ce 100644
--- a/src/wayland/idle_interface.h
+++ b/src/wayland/idle_interface.h
@@ -75,7 +75,7 @@ public:
     void inhibit();
 
     /**
-     * Unhibits the IdleInterface. The idle timeouts are only restarted if uninhibit has been
+     * Inhibits the IdleInterface. The idle timeouts are only restarted if uninhibit has been
      * called the same amount as inhibit.
      *
      * @see inhibit
diff --git a/src/wayland/server/idleinhibit_interface.h b/src/wayland/server/idleinhibit_interface.h
index b634770557..6a5c7d94ab 100644
--- a/src/wayland/server/idleinhibit_interface.h
+++ b/src/wayland/server/idleinhibit_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_IDLEINHIBIT_H
-#define KWAYLAND_SERVER_IDLEINHIBIT_H
+#ifndef KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_H
+#define KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/server/idleinhibit_interface_p.h b/src/wayland/server/idleinhibit_interface_p.h
index 8ba5766cca..3577ddcf08 100644
--- a/src/wayland/server/idleinhibit_interface_p.h
+++ b/src/wayland/server/idleinhibit_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_IDLEINHIBIT_P_H
-#define KWAYLAND_SERVER_IDLEINHIBIT_P_H
+#ifndef KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_P_H
+#define KWAYLAND_SERVER_IDLEINHIBIT_INTERFACE_P_H
 
 #include "idleinhibit_interface.h"
 #include "global_p.h"
diff --git a/src/wayland/server/outputchangeset.h b/src/wayland/server/outputchangeset.h
index 0555f555f3..6c5b8e41b6 100644
--- a/src/wayland/server/outputchangeset.h
+++ b/src/wayland/server/outputchangeset.h
@@ -18,8 +18,8 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
-#ifndef WAYLAND_SERVER_CHANGESET_H
-#define WAYLAND_SERVER_CHANGESET_H
+#ifndef WAYLAND_SERVER_OUTPUT_CHANGESET_H
+#define WAYLAND_SERVER_OUTPUT_CHANGESET_H
 
 #include <QObject>
 
diff --git a/src/wayland/server/outputconfiguration_interface.h b/src/wayland/server/outputconfiguration_interface.h
index 2ab5f660ed..a7e2db2988 100644
--- a/src/wayland/server/outputconfiguration_interface.h
+++ b/src/wayland/server/outputconfiguration_interface.h
@@ -17,8 +17,8 @@
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_OUTPUTCONFIGURATION_H
-#define KWAYLAND_SERVER_OUTPUTCONFIGURATION_H
+#ifndef KWAYLAND_SERVER_OUTPUTCONFIGURATION_INTERFACE_H
+#define KWAYLAND_SERVER_OUTPUTCONFIGURATION_INTERFACE_H
 
 #include "resource.h"
 #include "outputmanagement_interface.h"
diff --git a/src/wayland/server/outputmanagement_interface.cpp b/src/wayland/server/outputmanagement_interface.cpp
index 3aa0213e3e..7099716aa2 100644
--- a/src/wayland/server/outputmanagement_interface.cpp
+++ b/src/wayland/server/outputmanagement_interface.cpp
@@ -22,7 +22,6 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "outputconfiguration_interface.h"
 #include "display.h"
 #include "global_p.h"
-#include "display.h"
 
 #include <wayland-server.h>
 #include "wayland-output-management-server-protocol.h"
diff --git a/src/wayland/server/outputmanagement_interface.h b/src/wayland/server/outputmanagement_interface.h
index c954764366..94986680f9 100644
--- a/src/wayland/server/outputmanagement_interface.h
+++ b/src/wayland/server/outputmanagement_interface.h
@@ -17,8 +17,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
-#ifndef KWAYLAND_SERVER_OUTPUTMANAGEMENT_H
-#define KWAYLAND_SERVER_OUTPUTMANAGEMENT_H
+#ifndef KWAYLAND_SERVER_OUTPUTMANAGEMENT_INTERFACE_H
+#define KWAYLAND_SERVER_OUTPUTMANAGEMENT_INTERFACE_H
 
 #include "global.h"
 
diff --git a/src/wayland/server/pointerconstraints_interface.h b/src/wayland/server/pointerconstraints_interface.h
index 7efceaa71a..32f8752ea7 100644
--- a/src/wayland/server/pointerconstraints_interface.h
+++ b/src/wayland/server/pointerconstraints_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_H
-#define KWAYLAND_SERVER_POINTERCONSTRAINTS_H
+#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_H
+#define KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/server/pointerconstraints_interface_p.h b/src/wayland/server/pointerconstraints_interface_p.h
index 0dafbfe200..eb25ee4fb3 100644
--- a/src/wayland/server/pointerconstraints_interface_p.h
+++ b/src/wayland/server/pointerconstraints_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_P_H
-#define KWAYLAND_SERVER_POINTERCONSTRAINTS_P_H
+#ifndef KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_P_H
+#define KWAYLAND_SERVER_POINTERCONSTRAINTS_INTERFACE_P_H
 #include "pointerconstraints_interface.h"
 #include "global_p.h"
 #include "resource_p.h"
diff --git a/src/wayland/server/pointergestures_interface.h b/src/wayland/server/pointergestures_interface.h
index 4af2d6976e..e5f9d0987b 100644
--- a/src/wayland/server/pointergestures_interface.h
+++ b/src/wayland/server/pointergestures_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERGESTURES_H
-#define KWAYLAND_SERVER_POINTERGESTURES_H
+#ifndef KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_H
+#define KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_H
 
 #include "global.h"
 
diff --git a/src/wayland/server/pointergestures_interface_p.h b/src/wayland/server/pointergestures_interface_p.h
index 170b6b6d5b..264d1117a0 100644
--- a/src/wayland/server/pointergestures_interface_p.h
+++ b/src/wayland/server/pointergestures_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_POINTERGESTURES_P_H
-#define KWAYLAND_SERVER_POINTERGESTURES_P_H
+#ifndef KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_P_H
+#define KWAYLAND_SERVER_POINTERGESTURES_INTERFACE_P_H
 
 #include "pointergestures_interface.h"
 #include "resource_p.h"
diff --git a/src/wayland/server/relativepointer_interface.h b/src/wayland/server/relativepointer_interface.h
index aa8507c814..c2311f6b74 100644
--- a/src/wayland/server/relativepointer_interface.h
+++ b/src/wayland/server/relativepointer_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_RELATIVE_POINTER_H
-#define KWAYLAND_SERVER_RELATIVE_POINTER_H
+#ifndef KWAYLAND_SERVER_RELATIVE_POINTER_INTERFACE_H
+#define KWAYLAND_SERVER_RELATIVE_POINTER_INTERFACE_H
 
 #include "global.h"
 
diff --git a/src/wayland/server/remote_access_interface.cpp b/src/wayland/server/remote_access_interface.cpp
index 8b96f38fd6..f0571d4c94 100644
--- a/src/wayland/server/remote_access_interface.cpp
+++ b/src/wayland/server/remote_access_interface.cpp
@@ -17,9 +17,9 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#include "output_interface.h"
 #include "remote_access_interface.h"
 #include "remote_access_interface_p.h"
+#include "output_interface.h"
 #include "display.h"
 #include "global_p.h"
 #include "resource_p.h"
diff --git a/src/wayland/server/remote_access_interface.h b/src/wayland/server/remote_access_interface.h
index 67ba00e6a1..c0f8ee6f9e 100644
--- a/src/wayland/server/remote_access_interface.h
+++ b/src/wayland/server/remote_access_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_H
-#define KWAYLAND_SERVER_REMOTE_ACCESS_H
+#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_H
+#define KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_H
 
 #include "global.h"
 
diff --git a/src/wayland/server/remote_access_interface_p.h b/src/wayland/server/remote_access_interface_p.h
index dd8db0f67a..fa28ea975f 100644
--- a/src/wayland/server/remote_access_interface_p.h
+++ b/src/wayland/server/remote_access_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_P_H
-#define KWAYLAND_SERVER_REMOTE_ACCESS_P_H
+#ifndef KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_P_H
+#define KWAYLAND_SERVER_REMOTE_ACCESS_INTERFACE_P_H
 
 #include "resource.h"
 
diff --git a/src/wayland/server/shell_interface.h b/src/wayland/server/shell_interface.h
index 542e27375a..75757aea65 100644
--- a/src/wayland/server/shell_interface.h
+++ b/src/wayland/server/shell_interface.h
@@ -90,7 +90,7 @@ class KWAYLANDSERVER_EXPORT ShellSurfaceInterface : public Resource
      **/
     Q_PROPERTY(QByteArray windowClass READ windowClass NOTIFY windowClassChanged)
     /**
-     * Whether the window is fullscren.
+     * Whether the window is fullscreen.
      **/
     Q_PROPERTY(bool fullscreen READ isFullscreen NOTIFY fullscreenChanged)
     /**
diff --git a/src/wayland/server/textinput_interface.h b/src/wayland/server/textinput_interface.h
index 941664955f..005bf815d0 100644
--- a/src/wayland/server/textinput_interface.h
+++ b/src/wayland/server/textinput_interface.h
@@ -384,7 +384,7 @@ Q_SIGNALS:
      **/
     void requestReset();
     /**
-     * Emitted whenever the preffered @p language changes.
+     * Emitted whenever the preferred @p language changes.
      * @see preferredLanguage
      **/
     void preferredLanguageChanged(const QByteArray &language);
diff --git a/src/wayland/server/xdgforeign_interface.h b/src/wayland/server/xdgforeign_interface.h
index ffa5fcdc7f..c4983146f2 100644
--- a/src/wayland/server/xdgforeign_interface.h
+++ b/src/wayland/server/xdgforeign_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_XDGFOREIGN_H
-#define KWAYLAND_SERVER_XDGFOREIGN_H
+#ifndef KWAYLAND_SERVER_XDGFOREIGN_INTERFACE_H
+#define KWAYLAND_SERVER_XDGFOREIGN_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/server/xdgoutput_interface.h b/src/wayland/server/xdgoutput_interface.h
index 2d23788e1b..ec70fda1a6 100644
--- a/src/wayland/server/xdgoutput_interface.h
+++ b/src/wayland/server/xdgoutput_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_XDGOUTPUT_H
-#define KWAYLAND_SERVER_XDGOUTPUT_H
+#ifndef KWAYLAND_SERVER_XDGOUTPUT_INTERFACE_H
+#define KWAYLAND_SERVER_XDGOUTPUT_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/server_decoration_interface.h b/src/wayland/server_decoration_interface.h
index b33cd27aeb..4bf8040d6f 100644
--- a/src/wayland/server_decoration_interface.h
+++ b/src/wayland/server_decoration_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_SERVER_DECORATION_H
-#define KWAYLAND_SERVER_SERVER_DECORATION_H
+#ifndef KWAYLAND_SERVER_SERVER_DECORATION_INTERFACE_H
+#define KWAYLAND_SERVER_SERVER_DECORATION_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/server_decoration_palette_interface.h b/src/wayland/server_decoration_palette_interface.h
index 2ec33465db..7f22a976a1 100644
--- a/src/wayland/server_decoration_palette_interface.h
+++ b/src/wayland/server_decoration_palette_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_DECORATION_PALETTE_H
-#define KWAYLAND_SERVER_DECORATION_PALETTE_H
+#ifndef KWAYLAND_SERVER_DECORATION_PALETTE_INTERFACE_H
+#define KWAYLAND_SERVER_DECORATION_PALETTE_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/slide_interface.h b/src/wayland/slide_interface.h
index 485e1e0031..07fc5139f7 100644
--- a/src/wayland/slide_interface.h
+++ b/src/wayland/slide_interface.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_SLIDE_H
-#define KWAYLAND_SERVER_SLIDE_H
+#ifndef KWAYLAND_SERVER_SLIDE_INTERFACE_H
+#define KWAYLAND_SERVER_SLIDE_INTERFACE_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/tests/dpmstest.cpp b/src/wayland/tests/dpmstest.cpp
index c23ddd43b4..8071c79867 100644
--- a/src/wayland/tests/dpmstest.cpp
+++ b/src/wayland/tests/dpmstest.cpp
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
             if (hasDpms) {
                 hasDpmsLabel->setText(QStringLiteral("Compositor provides a DpmsManager"));
             } else {
-                hasDpmsLabel->setText(QStringLiteral("Compositor does not provid a DpmsManager"));
+                hasDpmsLabel->setText(QStringLiteral("Compositor does not provide a DpmsManager"));
             }
 
             QVBoxLayout *layout = new QVBoxLayout;
diff --git a/src/wayland/tests/qtwaylandintegrationtest.h b/src/wayland/tests/qtwaylandintegrationtest.h
index 68bec77d46..b972edc12b 100644
--- a/src/wayland/tests/qtwaylandintegrationtest.h
+++ b/src/wayland/tests/qtwaylandintegrationtest.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#ifndef WAYLANDCLIENTTEST_H
-#define WAYLANDCLIENTTEST_H
+#ifndef QTWAYLANDINTEGRATIONTEST_H
+#define QTWAYLANDINTEGRATIONTEST_H
 
 #include <QObject>
 #include <QSize>
diff --git a/src/wayland/tests/touchclienttest.h b/src/wayland/tests/touchclienttest.h
index 963089de7b..48f424b8d5 100644
--- a/src/wayland/tests/touchclienttest.h
+++ b/src/wayland/tests/touchclienttest.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#ifndef WAYLANDCLIENTTEST_H
-#define WAYLANDCLIENTTEST_H
+#ifndef TOUCHCLIENTTEST_H
+#define TOUCHCLIENTTEST_H
 
 #include <QObject>
 #include <QSize>
diff --git a/src/wayland/xdgforeign_v2_interface_p.h b/src/wayland/xdgforeign_v2_interface_p.h
index d0424300fe..c3fce2e641 100644
--- a/src/wayland/xdgforeign_v2_interface_p.h
+++ b/src/wayland/xdgforeign_v2_interface_p.h
@@ -17,8 +17,8 @@ Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ****************************************************************************/
-#ifndef KWAYLAND_SERVER_XDGFOREIGNV2_P_H
-#define KWAYLAND_SERVER_XDGFOREIGNV2_P_H
+#ifndef KWAYLAND_SERVER_XDGFOREIGNV2_INTERFACE_P_H
+#define KWAYLAND_SERVER_XDGFOREIGNV2_INTERFACE_P_H
 
 #include "global.h"
 #include "resource.h"
diff --git a/src/wayland/xdgshell_interface.h b/src/wayland/xdgshell_interface.h
index c9c28d3760..a03596611d 100644
--- a/src/wayland/xdgshell_interface.h
+++ b/src/wayland/xdgshell_interface.h
@@ -334,7 +334,7 @@ Q_SIGNALS:
     void transientForChanged();
 
     /**
-     * Emitted whenever the maximun size hint changes
+     * Emitted whenever the maximum size hint changes
      * @since 5.39
      */
     void maxSizeChanged(const QSize &size);
@@ -421,7 +421,7 @@ public:
 
     /**
      * Specifies in what direction the popup should be positioned around the anchor
-     * i.e if the gravity is "bottom", then then the top of top of the poup will be at the anchor edge
+     * i.e if the gravity is "bottom", then then the top of top of the popup will be at the anchor edge
      * if the gravity is top, then the bottom of the popup will be at the anchor edge
      *
      * @since 5.39