diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp
index 9ed4bc83..556e8a52 100644
--- a/src/collection/collectionwatcher.cpp
+++ b/src/collection/collectionwatcher.cpp
@@ -71,7 +71,7 @@ using namespace std::chrono_literals;
 namespace {
 static const char *kNoMediaFile = ".nomedia";
 static const char *kNoMusicFile = ".nomusic";
-}
+}  // namespace
 
 QStringList CollectionWatcher::sValidImages = QStringList() << "jpg" << "png" << "gif" << "jpeg";
 
diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 43600237..f4560e3f 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -213,7 +213,7 @@ const char *MainWindow::kAllFilesFilterSpec = QT_TR_NOOP("All Files (*)");
 namespace {
 const int kTrackSliderUpdateTimeMs = 200;
 const int kTrackPositionUpdateTimeMs = 1000;
-}
+}  // namespace
 
 MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_icon, OSDBase *osd, const CommandlineOptions &options, QWidget *parent) :
       QMainWindow(parent),
diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp
index 8528f6d8..1cb84bb1 100644
--- a/src/core/mpris2.cpp
+++ b/src/core/mpris2.cpp
@@ -551,7 +551,7 @@ QDBusObjectPath MakePlaylistPath(int id) {
   return QDBusObjectPath(QString("/org/strawberrymusicplayer/strawberry/PlaylistId/%1").arg(id));
 }
 
-}
+}  // namespace
 
 MaybePlaylist Mpris2::ActivePlaylist() const {
 
diff --git a/src/device/devicelister.cpp b/src/device/devicelister.cpp
index 60407405..2693c386 100644
--- a/src/device/devicelister.cpp
+++ b/src/device/devicelister.cpp
@@ -207,7 +207,7 @@ QString GetIpodModel(Itdb_IpodModel model) {
 }
 
 #endif
-}
+}  // namespace
 
 QUrl DeviceLister::MakeUrlFromLocalPath(const QString &path) const {
 
diff --git a/src/engine/enginetype.cpp b/src/engine/enginetype.cpp
index 6a9b5aac..c06ee650 100644
--- a/src/engine/enginetype.cpp
+++ b/src/engine/enginetype.cpp
@@ -51,4 +51,4 @@ QString EngineDescription(Engine::EngineType enginetype) {
   }
 }
 
-}
+}  // namespace Engine
diff --git a/src/globalshortcuts/globalshortcut-x11.cpp b/src/globalshortcuts/globalshortcut-x11.cpp
index 77e066be..673f0796 100644
--- a/src/globalshortcuts/globalshortcut-x11.cpp
+++ b/src/globalshortcuts/globalshortcut-x11.cpp
@@ -69,7 +69,7 @@ quint32 AppRootWindow() {
 
 }
 
-}
+}  // namespace
 
 quint32 GlobalShortcut::nativeModifiers(Qt::KeyboardModifiers qt_mods) {
 
diff --git a/src/internet/internetsearchmodel.cpp b/src/internet/internetsearchmodel.cpp
index e3b94427..2c96ee32 100644
--- a/src/internet/internetsearchmodel.cpp
+++ b/src/internet/internetsearchmodel.cpp
@@ -350,6 +350,7 @@ QMimeData *InternetSearchModel::mimeData(const QModelIndexList &indexes) const {
 }
 
 namespace {
+
 void GatherResults(const QStandardItem *parent, InternetSearchView::ResultList *results) {
 
   QVariant result_variant = parent->data(InternetSearchModel::Role_Result);
@@ -361,8 +362,10 @@ void GatherResults(const QStandardItem *parent, InternetSearchView::ResultList *
   for (int i = 0 ; i < parent->rowCount() ; ++i) {
     GatherResults(parent->child(i), results);
   }
+
 }
-}
+
+}  // namespace
 
 void InternetSearchModel::SetGroupBy(const CollectionModel::Grouping grouping, const bool regroup_now) {
 
diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp
index 653b1e8d..793861a5 100644
--- a/src/musicbrainz/acoustidclient.cpp
+++ b/src/musicbrainz/acoustidclient.cpp
@@ -124,7 +124,8 @@ struct IdSource {
   QString id_;
   int nb_sources_;
 };
-}
+
+}  // namespace
 
 void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id) {
 
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 0338fd6b..8272a9e2 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -1885,6 +1885,7 @@ void Playlist::Shuffle() {
 }
 
 namespace {
+
 bool AlbumShuffleComparator(const QMap<QString, int> &album_key_positions, const QMap<int, QString> &album_keys, const int left, const int right) {
 
   const int left_pos = album_key_positions[album_keys[left]];
@@ -1894,7 +1895,8 @@ bool AlbumShuffleComparator(const QMap<QString, int> &album_key_positions, const
   return left_pos < right_pos;
 
 }
-}
+
+}  // namespace
 
 void Playlist::ReshuffleIndices() {
 
diff --git a/src/playlist/playlistundocommands.cpp b/src/playlist/playlistundocommands.cpp
index b4de22bb..c47ec0d0 100644
--- a/src/playlist/playlistundocommands.cpp
+++ b/src/playlist/playlistundocommands.cpp
@@ -135,4 +135,4 @@ ShuffleItems::ShuffleItems(Playlist *playlist, const PlaylistItemList &new_items
   setText(tr("shuffle songs"));
 }
 
-}  // namespace
+}  // namespace PlaylistUndoCommands
diff --git a/src/widgets/volumeslider.cpp b/src/widgets/volumeslider.cpp
index df383d9d..37f4f23c 100644
--- a/src/widgets/volumeslider.cpp
+++ b/src/widgets/volumeslider.cpp
@@ -193,8 +193,8 @@ namespace Amarok {
 namespace ColorScheme {
 extern QColor Background;
 extern QColor Foreground;
-}
-}
+}  // namespace ColorScheme
+}  // namespace Amarok
 
 #if 0
 /** these functions aren't required in our fixed size world, but they may become useful one day **/