diff --git a/src/ChannelListenerManager.cpp b/src/ChannelListenerManager.cpp
index 7151d90c121..0370ed2e955 100644
--- a/src/ChannelListenerManager.cpp
+++ b/src/ChannelListenerManager.cpp
@@ -12,7 +12,7 @@
 
 std::size_t qHash(const ChannelListener &listener) {
 	return std::hash< ChannelListener >()(listener);
-};
+}
 
 bool operator==(const ChannelListener &lhs, const ChannelListener &rhs) {
 	return lhs.channelID == rhs.channelID && lhs.userSession == rhs.userSession;
diff --git a/src/MumbleConstants.h b/src/MumbleConstants.h
index 122147037a4..cb8597c45c4 100644
--- a/src/MumbleConstants.h
+++ b/src/MumbleConstants.h
@@ -13,8 +13,8 @@ namespace Plugins {
 		constexpr int MAX_DATA_LENGTH    = 1000;
 		constexpr int MAX_DATA_ID_LENGTH = 100;
 
-	}; // namespace PluginMessage
-};     // namespace Plugins
-};     // namespace Mumble
+	} // namespace PluginMessage
+}     // namespace Plugins
+}     // namespace Mumble
 
 #endif // MUMBLE_MUMBLECONSTANTS_H_
diff --git a/src/mumble/API.h b/src/mumble/API.h
index 8d450599593..a3e16860672 100644
--- a/src/mumble/API.h
+++ b/src/mumble/API.h
@@ -197,15 +197,15 @@ class PluginData {
 	/// @returns A reference to the PluginData singleton
 	static PluginData &get();
 }; // class PluginData
-}; // namespace API
+} // namespace API
 
 
 // Declare the meta-types that we require in order for the API to work
-Q_DECLARE_METATYPE(mumble_settings_key_t);
-Q_DECLARE_METATYPE(mumble_settings_key_t *);
-Q_DECLARE_METATYPE(mumble_transmission_mode_t);
-Q_DECLARE_METATYPE(mumble_transmission_mode_t *);
-Q_DECLARE_METATYPE(std::shared_ptr< API::api_promise_t >);
+Q_DECLARE_METATYPE(mumble_settings_key_t)
+Q_DECLARE_METATYPE(mumble_settings_key_t *)
+Q_DECLARE_METATYPE(mumble_transmission_mode_t)
+Q_DECLARE_METATYPE(mumble_transmission_mode_t *)
+Q_DECLARE_METATYPE(std::shared_ptr< API::api_promise_t >)
 
 //////////////////////////////////////////////////////////////
 ///////////// SYNCHRONIZATION STRATEGY ///////////////////////
diff --git a/src/mumble/API_v_1_x_x.cpp b/src/mumble/API_v_1_x_x.cpp
index fa8e6242f37..771013a4f86 100644
--- a/src/mumble/API_v_1_x_x.cpp
+++ b/src/mumble/API_v_1_x_x.cpp
@@ -2828,7 +2828,7 @@ PluginData &PluginData::get() {
 
 	return *instance;
 }
-}; // namespace API
+} // namespace API
 
 #undef EXIT_WITH
 #undef VERIFY_PLUGIN_ID
diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
index 23f627a420a..ea69d126565 100644
--- a/src/mumble/AudioInput.cpp
+++ b/src/mumble/AudioInput.cpp
@@ -318,7 +318,7 @@ AudioInput::~AudioInput() {
 
 bool AudioInput::isTransmitting() const {
 	return bPreviousVoice;
-};
+}
 
 #define IN_MIXER_FLOAT(channels)                                                                             \
 	static void inMixerFloat##channels(float *RESTRICT buffer, const void *RESTRICT ipt, unsigned int nsamp, \
diff --git a/src/mumble/EnumStringConversions.cpp b/src/mumble/EnumStringConversions.cpp
index a3c8e26e074..560ff4a878e 100644
--- a/src/mumble/EnumStringConversions.cpp
+++ b/src/mumble/EnumStringConversions.cpp
@@ -247,7 +247,7 @@ namespace details {
 
 PROCESS_ALL_ENUMS
 
-};
+}
 
 #undef PROCESS
 #undef AFTER_CODE
diff --git a/src/mumble/EnumStringConversions.h b/src/mumble/EnumStringConversions.h
index 1431127dd6e..6c5f6be4257 100644
--- a/src/mumble/EnumStringConversions.h
+++ b/src/mumble/EnumStringConversions.h
@@ -62,7 +62,7 @@ void stringToEnum(const std::string &str, OverlaySettings::OverlayShow &e);
 void stringToEnum(const std::string &str, OverlaySettings::OverlaySort &e);
 void stringToEnum(const std::string &str, OverlaySettings::OverlayExclusionMode &e);
 
-}; // namespace details
+} // namespace details
 
 template< typename T > T stringToEnum(const std::string &str) {
 	static_assert(std::is_enum< T >::value, "Only enums can be converted to strings with this function");
diff --git a/src/mumble/JSONSerialization.h b/src/mumble/JSONSerialization.h
index 17b0baee692..00eb336a95c 100644
--- a/src/mumble/JSONSerialization.h
+++ b/src/mumble/JSONSerialization.h
@@ -113,7 +113,7 @@ template<> inline QString from_string< QString >(const std::string &str) {
 	return QString::fromStdString(str);
 }
 
-}; // namespace details
+} // namespace details
 
 
 
diff --git a/src/mumble/Log.h b/src/mumble/Log.h
index 311109170c5..fec341a9c8c 100644
--- a/src/mumble/Log.h
+++ b/src/mumble/Log.h
@@ -192,6 +192,6 @@ class LogDocumentResourceAddedEvent : public QEvent {
 	LogDocumentResourceAddedEvent();
 };
 
-Q_DECLARE_METATYPE(Log::MsgType);
+Q_DECLARE_METATYPE(Log::MsgType)
 
 #endif
diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h
index 9c74dc2fd95..25778a65713 100644
--- a/src/mumble/MainWindow.h
+++ b/src/mumble/MainWindow.h
@@ -41,7 +41,7 @@ class PTTButtonWidget;
 
 namespace Search {
 class SearchDialog;
-};
+}
 
 class MenuLabel;
 class ListenerVolumeSlider;
diff --git a/src/mumble/ManualPlugin.h b/src/mumble/ManualPlugin.h
index 2632fe445e6..9b407ce8874 100644
--- a/src/mumble/ManualPlugin.h
+++ b/src/mumble/ManualPlugin.h
@@ -25,7 +25,7 @@ struct Position2D {
 // We need this typedef in order to be able to pass this hash as an argument
 // to QMetaObject::invokeMethod
 using PositionMap = QHash< unsigned int, Position2D >;
-Q_DECLARE_METATYPE(PositionMap);
+Q_DECLARE_METATYPE(PositionMap)
 
 
 /// A struct holding information about a stale entry in the
diff --git a/src/mumble/Markdown.cpp b/src/mumble/Markdown.cpp
index fdc802cd636..75319605f03 100644
--- a/src/mumble/Markdown.cpp
+++ b/src/mumble/Markdown.cpp
@@ -404,4 +404,4 @@ QString markdownToHTML(const QString &markdownInput) {
 
 	return htmlString;
 }
-}; // namespace Markdown
+} // namespace Markdown
diff --git a/src/mumble/Markdown.h b/src/mumble/Markdown.h
index 628879eb8a2..080bf00547c 100644
--- a/src/mumble/Markdown.h
+++ b/src/mumble/Markdown.h
@@ -15,6 +15,6 @@ namespace Markdown {
 /// @param markdownInput A reference to the input string
 /// @returns The processed HTML string
 QString markdownToHTML(const QString &markdownInput);
-}; // namespace Markdown
+} // namespace Markdown
 
 #endif // MUMBLE_MUMBLE_MARKDOWN_H_
diff --git a/src/mumble/PluginManifest.h b/src/mumble/PluginManifest.h
index 1bb1a594117..f2d6633b5ed 100644
--- a/src/mumble/PluginManifest.h
+++ b/src/mumble/PluginManifest.h
@@ -16,8 +16,8 @@
 namespace Poco {
 namespace XML {
 	class Document;
-}; // namespace XML
-}; // namespace Poco
+} // namespace XML
+} // namespace Poco
 
 struct PluginManifestException : std::runtime_error {
 	PluginManifestException(const std::string &msg = "") : std::runtime_error(msg) {}
@@ -39,7 +39,7 @@ template<> struct hash< PluginRuntimeSpec > {
 		return std::hash< std::string >()(spec.os) ^ (std::hash< std::string >()(spec.architecture) << 1);
 	}
 };
-}; // namespace std
+} // namespace std
 
 class PluginManifest {
 public:
diff --git a/src/mumble/PositionalAudioViewer.h b/src/mumble/PositionalAudioViewer.h
index ec7dad824c0..020c56c9ab9 100644
--- a/src/mumble/PositionalAudioViewer.h
+++ b/src/mumble/PositionalAudioViewer.h
@@ -15,7 +15,7 @@
 
 namespace Ui {
 class PositionalAudioViewer;
-};
+}
 
 class PositionalAudioViewer : public QDialog {
 public:
diff --git a/src/mumble/QtWidgetUtils.cpp b/src/mumble/QtWidgetUtils.cpp
index 32ab98edbb4..ea9cb53ecef 100644
--- a/src/mumble/QtWidgetUtils.cpp
+++ b/src/mumble/QtWidgetUtils.cpp
@@ -55,5 +55,5 @@ namespace QtUtils {
 		}
 	}
 
-}; // namespace QtUtils
-}; // namespace Mumble
+} // namespace QtUtils
+} // namespace Mumble
diff --git a/src/mumble/QtWidgetUtils.h b/src/mumble/QtWidgetUtils.h
index 3972131e369..f3e1bbae4bc 100644
--- a/src/mumble/QtWidgetUtils.h
+++ b/src/mumble/QtWidgetUtils.h
@@ -28,7 +28,7 @@ namespace QtUtils {
 
 	void elideText(QTextDocument &doc, uint32_t width);
 
-}; // namespace QtUtils
-}; // namespace Mumble
+} // namespace QtUtils
+} // namespace Mumble
 
 #endif // MUMBLE_MUMBLE_QTWIDGETUTILS_H_
diff --git a/src/mumble/Screen.cpp b/src/mumble/Screen.cpp
index c995361a632..fd81d0d0e67 100644
--- a/src/mumble/Screen.cpp
+++ b/src/mumble/Screen.cpp
@@ -63,5 +63,5 @@ namespace Screen {
 #endif
 	}
 
-}; // namespace Screen
-}; // namespace Mumble
+} // namespace Screen
+} // namespace Mumble
diff --git a/src/mumble/Screen.h b/src/mumble/Screen.h
index ec6f6c1e28e..1050fc6365a 100644
--- a/src/mumble/Screen.h
+++ b/src/mumble/Screen.h
@@ -18,8 +18,8 @@ namespace Screen {
 	QWindow *windowFromWidget(const QWidget &widget);
 	QScreen *screenFromWidget(const QWidget &widget);
 	QScreen *screenAt(const QPoint &point);
-}; // namespace Screen
+} // namespace Screen
 
-}; // namespace Mumble
+} // namespace Mumble
 
 #endif
diff --git a/src/mumble/SearchDialog.cpp b/src/mumble/SearchDialog.cpp
index 0def4cee617..1f8da501ad6 100644
--- a/src/mumble/SearchDialog.cpp
+++ b/src/mumble/SearchDialog.cpp
@@ -597,4 +597,4 @@ bool SearchDialog::removeSearchResult(unsigned int id, bool isUser) {
 	return false;
 }
 
-}; // namespace Search
+} // namespace Search
diff --git a/src/mumble/SearchDialog.h b/src/mumble/SearchDialog.h
index 708417ef4e0..aefd12920d9 100644
--- a/src/mumble/SearchDialog.h
+++ b/src/mumble/SearchDialog.h
@@ -139,9 +139,9 @@ public slots:
 	bool removeSearchResult(unsigned int id, bool isUser);
 };
 
-}; // namespace Search
+} // namespace Search
 
-Q_DECLARE_METATYPE(Search::SearchDialog::UserAction);
-Q_DECLARE_METATYPE(Search::SearchDialog::ChannelAction);
+Q_DECLARE_METATYPE(Search::SearchDialog::UserAction)
+Q_DECLARE_METATYPE(Search::SearchDialog::ChannelAction)
 
 #endif // MUMBLE_MUMBLE_SEARCHDIALOG_H_
diff --git a/src/mumble/SettingsKeys.h b/src/mumble/SettingsKeys.h
index 9359eb2ee57..640d2e08378 100644
--- a/src/mumble/SettingsKeys.h
+++ b/src/mumble/SettingsKeys.h
@@ -340,6 +340,6 @@ const SettingsKey SETTINGS_VERSION_KEY     = { "settings_version" };
 const SettingsKey CERTIFICATE_KEY          = { "certificate" };
 const SettingsKey MUMBLE_QUIT_NORMALLY_KEY = { "mumble_has_quit_normally" };
 
-}; // namespace SettingsKeys
+} // namespace SettingsKeys
 
 #endif // MUMBLE_MUMBLE_SETTINGSKEYS_H_
diff --git a/src/mumble/ThemeInfo.h b/src/mumble/ThemeInfo.h
index 83e2246b3c5..6bda70bd6bf 100644
--- a/src/mumble/ThemeInfo.h
+++ b/src/mumble/ThemeInfo.h
@@ -83,7 +83,7 @@ class ThemeInfo {
 	QString defaultStyle;
 };
 
-Q_DECLARE_METATYPE(ThemeInfo);
-Q_DECLARE_METATYPE(ThemeInfo::StyleInfo);
+Q_DECLARE_METATYPE(ThemeInfo)
+Q_DECLARE_METATYPE(ThemeInfo::StyleInfo)
 
 #endif // MUMBLE_MUMBLE_THEMEINFO_H_
diff --git a/src/mumble/Translations.cpp b/src/mumble/Translations.cpp
index db552f853d0..c9b576cbab3 100644
--- a/src/mumble/Translations.cpp
+++ b/src/mumble/Translations.cpp
@@ -140,5 +140,5 @@ namespace Translations {
 
 		return guard;
 	}
-}; // namespace Translations
-}; // namespace Mumble
+} // namespace Translations
+} // namespace Mumble
diff --git a/src/mumble/Translations.h b/src/mumble/Translations.h
index a710a558fff..62fc9929cce 100644
--- a/src/mumble/Translations.h
+++ b/src/mumble/Translations.h
@@ -42,7 +42,7 @@ namespace Translations {
 	 */
 	LifetimeGuard installTranslators(const QLocale &locale, QApplication &app, const QStringList &extraDirectories);
 
-}; // namespace Translations
-}; // namespace Mumble
+} // namespace Translations
+} // namespace Mumble
 
 #endif // MUMBLE_MUMBLE_TRANSLATIONS_H_
diff --git a/src/murmur/DBus.h b/src/murmur/DBus.h
index 769028970ae..7af4a599f0c 100644
--- a/src/murmur/DBus.h
+++ b/src/murmur/DBus.h
@@ -31,7 +31,7 @@ struct PlayerInfo {
 		: session(0), mute(false), deaf(false), suppressed(false), selfMute(false), selfDeaf(false), channel(-1){};
 	PlayerInfo(const User *);
 };
-Q_DECLARE_METATYPE(PlayerInfo);
+Q_DECLARE_METATYPE(PlayerInfo)
 
 struct PlayerInfoExtended : public PlayerInfo {
 	int id;
@@ -41,8 +41,8 @@ struct PlayerInfoExtended : public PlayerInfo {
 	PlayerInfoExtended() : id(-1), onlinesecs(-1), bytespersec(-1){};
 	PlayerInfoExtended(const User *);
 };
-Q_DECLARE_METATYPE(PlayerInfoExtended);
-Q_DECLARE_METATYPE(QList< PlayerInfoExtended >);
+Q_DECLARE_METATYPE(PlayerInfoExtended)
+Q_DECLARE_METATYPE(QList< PlayerInfoExtended >)
 
 struct ChannelInfo {
 	int id;
@@ -52,8 +52,8 @@ struct ChannelInfo {
 	ChannelInfo() : id(-1), parent(-1){};
 	ChannelInfo(const Channel *c);
 };
-Q_DECLARE_METATYPE(ChannelInfo);
-Q_DECLARE_METATYPE(QList< ChannelInfo >);
+Q_DECLARE_METATYPE(ChannelInfo)
+Q_DECLARE_METATYPE(QList< ChannelInfo >)
 
 struct GroupInfo {
 	QString name;
@@ -62,8 +62,8 @@ struct GroupInfo {
 	GroupInfo() : inherited(false), inherit(false), inheritable(false){};
 	GroupInfo(const Group *g);
 };
-Q_DECLARE_METATYPE(GroupInfo);
-Q_DECLARE_METATYPE(QList< GroupInfo >);
+Q_DECLARE_METATYPE(GroupInfo)
+Q_DECLARE_METATYPE(QList< GroupInfo >)
 
 struct ACLInfo {
 	bool applyHere, applySubs, inherited;
@@ -73,8 +73,8 @@ struct ACLInfo {
 	ACLInfo() : applyHere(false), applySubs(false), inherited(false), playerid(-1), allow(0), deny(0){};
 	ACLInfo(const ChanACL *acl);
 };
-Q_DECLARE_METATYPE(ACLInfo);
-Q_DECLARE_METATYPE(QList< ACLInfo >);
+Q_DECLARE_METATYPE(ACLInfo)
+Q_DECLARE_METATYPE(QList< ACLInfo >)
 
 struct BanInfo {
 	unsigned int address;
@@ -82,8 +82,8 @@ struct BanInfo {
 	BanInfo() : address(0), bits(0){};
 	BanInfo(const Ban &);
 };
-Q_DECLARE_METATYPE(BanInfo);
-Q_DECLARE_METATYPE(QList< BanInfo >);
+Q_DECLARE_METATYPE(BanInfo)
+Q_DECLARE_METATYPE(QList< BanInfo >)
 
 struct RegisteredPlayer {
 	int id;
@@ -92,8 +92,8 @@ struct RegisteredPlayer {
 	QString pw;
 	RegisteredPlayer();
 };
-Q_DECLARE_METATYPE(RegisteredPlayer);
-Q_DECLARE_METATYPE(QList< RegisteredPlayer >);
+Q_DECLARE_METATYPE(RegisteredPlayer)
+Q_DECLARE_METATYPE(QList< RegisteredPlayer >)
 
 struct LogEntry {
 	unsigned int timestamp;
@@ -101,8 +101,8 @@ struct LogEntry {
 	LogEntry();
 	LogEntry(const ServerDB::LogRecord &);
 };
-Q_DECLARE_METATYPE(LogEntry);
-Q_DECLARE_METATYPE(QList< LogEntry >);
+Q_DECLARE_METATYPE(LogEntry)
+Q_DECLARE_METATYPE(QList< LogEntry >)
 
 class MurmurDBus : public QDBusAbstractAdaptor {
 private:
@@ -201,7 +201,7 @@ public slots:
 };
 
 typedef QMap< QString, QString > ConfigMap;
-Q_DECLARE_METATYPE(ConfigMap);
+Q_DECLARE_METATYPE(ConfigMap)
 
 class MetaDBus : public QDBusAbstractAdaptor {
 private:
diff --git a/src/murmur/TracyConstants.h b/src/murmur/TracyConstants.h
index 6c2f0db7ce8..0a9ee3c629b 100644
--- a/src/murmur/TracyConstants.h
+++ b/src/murmur/TracyConstants.h
@@ -20,6 +20,6 @@ static constexpr const char *AUDIO_ENCODE               = "audio_encode";
 static constexpr const char *AUDIO_UPDATE               = "audio_update";
 static constexpr const char *AUDIO_WHISPER_CACHE_STORE  = "audio_whisper_cache_restore";
 static constexpr const char *AUDIO_WHISPER_CACHE_CREATE = "audio_whisper_cache_create";
-}; // namespace TracyConstants
+} // namespace TracyConstants
 
 #endif // MUMBLE_MURMUR_TRACYCONSTANTS_H_