diff --git a/decorations/decorations_logging.cpp b/decorations/decorations_logging.cpp
index fb7cd66fc1..15cafdab79 100644
--- a/decorations/decorations_logging.cpp
+++ b/decorations/decorations_logging.cpp
@@ -18,4 +18,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "decorations_logging.h"
-Q_LOGGING_CATEGORY(KWIN_DECORATIONS, "kwin_decorations", QtCriticalMsg);
+Q_LOGGING_CATEGORY(KWIN_DECORATIONS, "kwin_decorations", QtCriticalMsg)
diff --git a/effectloader.h b/effectloader.h
index 00a50416d6..579fff3c0d 100644
--- a/effectloader.h
+++ b/effectloader.h
@@ -48,7 +48,7 @@ enum class LoadEffectFlag {
     Load = 1 << 0, ///< Effect should be loaded
     CheckDefaultFunction = 1 << 2 ///< The Check Default Function needs to be invoked if the Effect provides it
 };
-Q_DECLARE_FLAGS(LoadEffectFlags, LoadEffectFlag);
+Q_DECLARE_FLAGS(LoadEffectFlags, LoadEffectFlag)
 
 /**
  * @brief Interface to describe how an effect loader has to function.
diff --git a/effects/logging.cpp b/effects/logging.cpp
index a8a3e73cfb..d338c90452 100644
--- a/effects/logging.cpp
+++ b/effects/logging.cpp
@@ -18,4 +18,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include <kwineffects.h>
-Q_LOGGING_CATEGORY(KWINEFFECTS, "kwineffects", QtCriticalMsg);
+Q_LOGGING_CATEGORY(KWINEFFECTS, "kwineffects", QtCriticalMsg)
diff --git a/kcmkwin/kwincompositing/compositing.h b/kcmkwin/kwincompositing/compositing.h
index 05ee523e21..e9561ab4f1 100644
--- a/kcmkwin/kwincompositing/compositing.h
+++ b/kcmkwin/kwincompositing/compositing.h
@@ -42,7 +42,7 @@ class Compositing : public QObject
     Q_PROPERTY(int glSwapStrategy READ glSwapStrategy WRITE setGlSwapStrategy NOTIFY glSwapStrategyChanged)
     Q_PROPERTY(bool glColorCorrection READ glColorCorrection WRITE setGlColorCorrection NOTIFY glColorCorrectionChanged)
     Q_PROPERTY(int compositingType READ compositingType WRITE setCompositingType NOTIFY compositingTypeChanged)
-    Q_PROPERTY(bool compositingEnabled READ compositingEnabled WRITE setCompositingEnabled NOTIFY compositingEnabledChanged);
+    Q_PROPERTY(bool compositingEnabled READ compositingEnabled WRITE setCompositingEnabled NOTIFY compositingEnabledChanged)
     Q_PROPERTY(KWin::Compositing::OpenGLPlatformInterfaceModel *openGLPlatformInterfaceModel READ openGLPlatformInterfaceModel CONSTANT)
     Q_PROPERTY(int openGLPlatformInterface READ openGLPlatformInterface WRITE setOpenGLPlatformInterface NOTIFY openGLPlatformInterfaceChanged)
 public:
diff --git a/kcmkwin/kwincompositing/model.h b/kcmkwin/kwincompositing/model.h
index 5bdabecb5b..5db803195d 100644
--- a/kcmkwin/kwincompositing/model.h
+++ b/kcmkwin/kwincompositing/model.h
@@ -154,9 +154,9 @@ class EffectFilterModel : public QSortFilterProxyModel
      * Default value is @c true.
      **/
     Q_PROPERTY(bool filterOutInternal MEMBER m_filterOutInternal NOTIFY filterOutInternalChanged)
-    Q_PROPERTY(QColor backgroundActiveColor READ backgroundActiveColor CONSTANT);
-    Q_PROPERTY(QColor backgroundNormalColor READ backgroundNormalColor CONSTANT);
-    Q_PROPERTY(QColor backgroundAlternateColor READ backgroundAlternateColor CONSTANT);
+    Q_PROPERTY(QColor backgroundActiveColor READ backgroundActiveColor CONSTANT)
+    Q_PROPERTY(QColor backgroundNormalColor READ backgroundNormalColor CONSTANT)
+    Q_PROPERTY(QColor backgroundAlternateColor READ backgroundAlternateColor CONSTANT)
     Q_PROPERTY(QColor sectionColor READ sectionColor CONSTANT)
 public:
     EffectFilterModel(QObject *parent = 0);
diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp
index cb88ff36aa..7ecf963673 100644
--- a/kcmkwin/kwinscripts/module.cpp
+++ b/kcmkwin/kwinscripts/module.cpp
@@ -39,7 +39,7 @@
 
 #include "version.h"
 
-K_PLUGIN_FACTORY_DECLARATION(KcmKWinScriptsFactory);
+K_PLUGIN_FACTORY_DECLARATION(KcmKWinScriptsFactory)
 
 Module::Module(QWidget *parent, const QVariantList &args) :
     KCModule(parent, args),
diff --git a/keyboard_input.cpp b/keyboard_input.cpp
index 1b8095f9a0..3a6880a5d9 100644
--- a/keyboard_input.cpp
+++ b/keyboard_input.cpp
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <sys/mman.h>
 #include <unistd.h>
 
-Q_LOGGING_CATEGORY(KWIN_XKB, "kwin_xkbcommon", QtCriticalMsg);
+Q_LOGGING_CATEGORY(KWIN_XKB, "kwin_xkbcommon", QtCriticalMsg)
 
 namespace KWin
 {
diff --git a/libinput/libinput_logging.cpp b/libinput/libinput_logging.cpp
index 89dec0f69c..8a7c2f2263 100644
--- a/libinput/libinput_logging.cpp
+++ b/libinput/libinput_logging.cpp
@@ -18,5 +18,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "libinput_logging.h"
-Q_LOGGING_CATEGORY(KWIN_LIBINPUT, "kwin_libinput", QtCriticalMsg);
-
+Q_LOGGING_CATEGORY(KWIN_LIBINPUT, "kwin_libinput", QtCriticalMsg)
diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h
index d53493c64c..555bef8212 100644
--- a/libkwineffects/kwineffects.h
+++ b/libkwineffects/kwineffects.h
@@ -58,7 +58,7 @@ class QMatrix4x4;
  * Logging category to be used inside the KWin effects.
  * Do not use in this library.
  **/
-Q_DECLARE_LOGGING_CATEGORY(KWINEFFECTS);
+Q_DECLARE_LOGGING_CATEGORY(KWINEFFECTS)
 
 namespace KWayland {
     namespace Server {
diff --git a/libkwineffects/logging.cpp b/libkwineffects/logging.cpp
index b0c9a0167b..6b2c61e9d2 100644
--- a/libkwineffects/logging.cpp
+++ b/libkwineffects/logging.cpp
@@ -18,6 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "logging_p.h"
-Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "libkwineffects", QtCriticalMsg);
-Q_LOGGING_CATEGORY(LIBKWINGLUTILS, "libkwinglutils", QtCriticalMsg);
-Q_LOGGING_CATEGORY(LIBKWINXRENDERUTILS, "libkwinxrenderutils", QtCriticalMsg);
+Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "libkwineffects", QtCriticalMsg)
+Q_LOGGING_CATEGORY(LIBKWINGLUTILS, "libkwinglutils", QtCriticalMsg)
+Q_LOGGING_CATEGORY(LIBKWINXRENDERUTILS, "libkwinxrenderutils", QtCriticalMsg)
diff --git a/libkwineffects/logging_p.h b/libkwineffects/logging_p.h
index aed723be11..394d3d5356 100644
--- a/libkwineffects/logging_p.h
+++ b/libkwineffects/logging_p.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QLoggingCategory>
 #include <QDebug>
 
-Q_DECLARE_LOGGING_CATEGORY(LIBKWINEFFECTS);
-Q_DECLARE_LOGGING_CATEGORY(LIBKWINGLUTILS);
-Q_DECLARE_LOGGING_CATEGORY(LIBKWINXRENDERUTILS);
+Q_DECLARE_LOGGING_CATEGORY(LIBKWINEFFECTS)
+Q_DECLARE_LOGGING_CATEGORY(LIBKWINGLUTILS)
+Q_DECLARE_LOGGING_CATEGORY(LIBKWINXRENDERUTILS)
 
 #endif
diff --git a/scripting/scripting_logging.cpp b/scripting/scripting_logging.cpp
index b084f606fa..e4a24ece2f 100644
--- a/scripting/scripting_logging.cpp
+++ b/scripting/scripting_logging.cpp
@@ -18,4 +18,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "scripting_logging.h"
-Q_LOGGING_CATEGORY(KWIN_SCRIPTING, "kwin_scripting", QtCriticalMsg);
+Q_LOGGING_CATEGORY(KWIN_SCRIPTING, "kwin_scripting", QtCriticalMsg)
diff --git a/tabbox/tabbox_logging.cpp b/tabbox/tabbox_logging.cpp
index e6c90e1844..aae1b4ab59 100644
--- a/tabbox/tabbox_logging.cpp
+++ b/tabbox/tabbox_logging.cpp
@@ -18,4 +18,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "tabbox_logging.h"
-Q_LOGGING_CATEGORY(KWIN_TABBOX, "kwin_tabbox", QtCriticalMsg);
+Q_LOGGING_CATEGORY(KWIN_TABBOX, "kwin_tabbox", QtCriticalMsg)