diff --git a/src/gui/macOS/fileproviderxpc.h b/src/gui/macOS/fileproviderxpc.h
index d31213e3b..3ce162839 100644
--- a/src/gui/macOS/fileproviderxpc.h
+++ b/src/gui/macOS/fileproviderxpc.h
@@ -12,17 +12,15 @@
  * for more details.
  */
 
-#pragma once
-
 #include <QObject>
 
 #import <Foundation/Foundation.h>
 
 #import "ClientCommunicationProtocol.h"
 
-namespace OCC {
+#pragma once
 
-namespace Mac {
+namespace OCC::Mac {
 
 class FileProviderXPC : public QObject
 {
@@ -47,6 +45,4 @@ private:
     NSDictionary<NSString *, NSObject<ClientCommunicationProtocol> *_clientCommServices;
 };
 
-}
-
-}
+} // namespace OCC::Mac
diff --git a/src/gui/macOS/fileproviderxpc_mac.mm b/src/gui/macOS/fileproviderxpc_mac.mm
index f4000ca96..19db91e0e 100644
--- a/src/gui/macOS/fileproviderxpc_mac.mm
+++ b/src/gui/macOS/fileproviderxpc_mac.mm
@@ -19,9 +19,7 @@
 #include "gui/accountmanager.h"
 #include "gui/macOS/fileproviderxpc_mac_utils.h"
 
-namespace OCC {
-
-namespace Mac {
+namespace OCC::Mac {
 
 Q_LOGGING_CATEGORY(lcFileProviderXPC, "nextcloud.gui.macos.fileprovider.xpc", QtInfoMsg)
 
@@ -139,6 +137,4 @@ void FileProviderXPC::slotAccountStateChanged(const AccountState::State state) c
     }
 }
 
-} // namespace OCC
-
-} // namespace Mac
+} // namespace OCC::Mac
diff --git a/src/gui/macOS/fileproviderxpc_mac_utils.h b/src/gui/macOS/fileproviderxpc_mac_utils.h
index 04512b30b..2e4aed958 100644
--- a/src/gui/macOS/fileproviderxpc_mac_utils.h
+++ b/src/gui/macOS/fileproviderxpc_mac_utils.h
@@ -19,9 +19,7 @@
 
 #import "ClientCommunicationProtocol.h"
 
-namespace OCC {
-namespace Mac {
-namespace FileProviderXPCUtils {
+namespace OCC::Mac::FileProviderXPCUtils {
 
 NSArray<NSFileProviderManager *> *getDomainManagers();
 NSArray<NSURL *> *getDomainUrlsForManagers(NSArray<NSFileProviderManager *> *managers);
@@ -31,6 +29,4 @@ void configureFileProviderConnection(NSXPCConnection *connection);
 NSObject *getRemoteServiceObject(NSXPCConnection *connection, Protocol *protocol);
 NSString *getExtensionAccountId(NSObject<ClientCommunicationProtocol> *clientCommService);
 
-}
-}
 }
\ No newline at end of file
diff --git a/src/gui/macOS/fileproviderxpc_mac_utils.mm b/src/gui/macOS/fileproviderxpc_mac_utils.mm
index 4161855b2..964d24822 100644
--- a/src/gui/macOS/fileproviderxpc_mac_utils.mm
+++ b/src/gui/macOS/fileproviderxpc_mac_utils.mm
@@ -19,20 +19,14 @@
 #include "gui/accountmanager.h"
 
 namespace {
-
 const char *const clientCommunicationServiceName = "com.nextcloud.desktopclient.ClientCommunicationService";
 NSString *const nsClientCommunicationServiceName = [NSString stringWithUTF8String:clientCommunicationServiceName];
-
 }
 
-namespace OCC {
-
-namespace Mac {
+namespace OCC::Mac::FileProviderXPCUtils {
 
 Q_LOGGING_CATEGORY(lcFileProviderXPCUtils, "nextcloud.gui.macos.fileprovider.xpc.utils", QtInfoMsg)
 
-namespace FileProviderXPCUtils {
-
 NSArray<NSFileProviderManager *> *getDomainManagers()
 {
     dispatch_group_t group = dispatch_group_create();
@@ -225,8 +219,4 @@ NSString *getExtensionAccountId(NSObject<ClientCommunicationProtocol> *const cli
     return extensionNcAccount;
 }
 
-} // namespace FileProviderXPCUtils
-
-} // namespace Mac
-
-} // namespace OCC
+} // namespace OCC::Mac::FileProviderXPCUtils