diff --git a/examples/fabric-admin/BUILD.gn b/examples/fabric-admin/BUILD.gn
index 79e175fb4a70c1..ddaa33483257b1 100644
--- a/examples/fabric-admin/BUILD.gn
+++ b/examples/fabric-admin/BUILD.gn
@@ -69,7 +69,6 @@ static_library("fabric-admin-utils") {
 
   sources += [ "commands/interactive/InteractiveCommands.cpp" ]
   deps += [
-    "${chip_root}/examples/common/websocket-server",
     "${chip_root}/src/platform/logging:headers",
     "${editline_root}:editline",
   ]
diff --git a/examples/fabric-admin/commands/clusters/JsonParser.h b/examples/fabric-admin/commands/clusters/JsonParser.h
index 0871e767c21bd6..2a1cd62e97b028 100644
--- a/examples/fabric-admin/commands/clusters/JsonParser.h
+++ b/examples/fabric-admin/commands/clusters/JsonParser.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "../common/CustomStringPrefix.h"
+#include <commands/common/CustomStringPrefix.h>
 
 #include <json/json.h>
 #include <lib/core/Optional.h>
diff --git a/examples/fabric-admin/commands/clusters/ModelCommand.h b/examples/fabric-admin/commands/clusters/ModelCommand.h
index c14d3c9952f3fc..185f6179db330f 100644
--- a/examples/fabric-admin/commands/clusters/ModelCommand.h
+++ b/examples/fabric-admin/commands/clusters/ModelCommand.h
@@ -20,7 +20,7 @@
 
 #ifdef CONFIG_USE_LOCAL_STORAGE
 #include <controller/ExamplePersistentStorage.h>
-#endif // CONFIG_USE_LOCAL_STORAGE
+#endif
 
 #include "../common/CHIPCommand.h"
 #include <lib/core/CHIPEncoding.h>
diff --git a/examples/fabric-admin/commands/interactive/Commands.h b/examples/fabric-admin/commands/interactive/Commands.h
index e324ddae2680ae..2b66a2d9c70f94 100644
--- a/examples/fabric-admin/commands/interactive/Commands.h
+++ b/examples/fabric-admin/commands/interactive/Commands.h
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include "commands/common/CHIPCommand.h"
-#include "commands/common/Commands.h"
-#include "commands/interactive/InteractiveCommands.h"
+#include <commands/common/CHIPCommand.h>
+#include <commands/common/Commands.h>
+#include <commands/interactive/InteractiveCommands.h>
 
 void registerCommandsInteractive(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
diff --git a/examples/fabric-admin/commands/interactive/InteractiveCommands.h b/examples/fabric-admin/commands/interactive/InteractiveCommands.h
index 21c14a7a4c95ce..a0b490f3b668e5 100644
--- a/examples/fabric-admin/commands/interactive/InteractiveCommands.h
+++ b/examples/fabric-admin/commands/interactive/InteractiveCommands.h
@@ -18,11 +18,9 @@
 
 #pragma once
 
-#include "../clusters/DataModelLogger.h"
-#include "../common/CHIPCommand.h"
-#include "../common/Commands.h"
-
-#include <websocket-server/WebSocketServer.h>
+#include <commands/clusters/DataModelLogger.h>
+#include <commands/common/CHIPCommand.h>
+#include <commands/common/Commands.h>
 
 #include <string>
 
diff --git a/examples/fabric-admin/commands/pairing/Commands.h b/examples/fabric-admin/commands/pairing/Commands.h
index 6fdfacef79e34f..af07536bfda052 100644
--- a/examples/fabric-admin/commands/pairing/Commands.h
+++ b/examples/fabric-admin/commands/pairing/Commands.h
@@ -18,15 +18,15 @@
 
 #pragma once
 
-#include "commands/common/Commands.h"
-#include "commands/pairing/GetCommissionerNodeIdCommand.h"
-#include "commands/pairing/GetCommissionerRootCertificateCommand.h"
-#include "commands/pairing/IssueNOCChainCommand.h"
-#include "commands/pairing/OpenCommissioningWindowCommand.h"
-#include "commands/pairing/PairingCommand.h"
+#include <commands/common/Commands.h>
+#include <commands/common/CredentialIssuerCommands.h>
+#include <commands/pairing/GetCommissionerNodeIdCommand.h>
+#include <commands/pairing/GetCommissionerRootCertificateCommand.h>
+#include <commands/pairing/IssueNOCChainCommand.h>
+#include <commands/pairing/OpenCommissioningWindowCommand.h>
+#include <commands/pairing/PairingCommand.h>
 
 #include <app/server/Dnssd.h>
-#include <commands/common/CredentialIssuerCommands.h>
 #include <lib/dnssd/Resolver.h>
 
 class Unpair : public PairingCommand
diff --git a/examples/fabric-admin/commands/pairing/GetCommissionerNodeIdCommand.h b/examples/fabric-admin/commands/pairing/GetCommissionerNodeIdCommand.h
index 3234cfe456a956..10439830cb1345 100644
--- a/examples/fabric-admin/commands/pairing/GetCommissionerNodeIdCommand.h
+++ b/examples/fabric-admin/commands/pairing/GetCommissionerNodeIdCommand.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "../common/CHIPCommand.h"
-#include "../common/RemoteDataModelLogger.h"
+#include <commands/common/CHIPCommand.h>
+#include <commands/common/RemoteDataModelLogger.h>
 
 class GetCommissionerNodeIdCommand : public CHIPCommand
 {
diff --git a/examples/fabric-admin/commands/pairing/GetCommissionerRootCertificateCommand.h b/examples/fabric-admin/commands/pairing/GetCommissionerRootCertificateCommand.h
index 1d25efcc38224d..88afc9b6bace57 100644
--- a/examples/fabric-admin/commands/pairing/GetCommissionerRootCertificateCommand.h
+++ b/examples/fabric-admin/commands/pairing/GetCommissionerRootCertificateCommand.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "../common/CHIPCommand.h"
-#include "../common/RemoteDataModelLogger.h"
+#include <commands/common/CHIPCommand.h>
+#include <commands/common/RemoteDataModelLogger.h>
 
 #include "ToTLVCert.h"
 
diff --git a/examples/fabric-admin/commands/pairing/IssueNOCChainCommand.h b/examples/fabric-admin/commands/pairing/IssueNOCChainCommand.h
index 0103b26977136d..efed6738204008 100644
--- a/examples/fabric-admin/commands/pairing/IssueNOCChainCommand.h
+++ b/examples/fabric-admin/commands/pairing/IssueNOCChainCommand.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "../common/CHIPCommand.h"
-#include "../common/RemoteDataModelLogger.h"
+#include <commands/common/CHIPCommand.h>
+#include <commands/common/RemoteDataModelLogger.h>
 
 #include "ToTLVCert.h"
 
diff --git a/examples/fabric-admin/commands/pairing/OpenCommissioningWindowCommand.h b/examples/fabric-admin/commands/pairing/OpenCommissioningWindowCommand.h
index 99b179d8753125..2c1d62f31c566b 100644
--- a/examples/fabric-admin/commands/pairing/OpenCommissioningWindowCommand.h
+++ b/examples/fabric-admin/commands/pairing/OpenCommissioningWindowCommand.h
@@ -18,8 +18,7 @@
 
 #pragma once
 
-#include "../common/CHIPCommand.h"
-
+#include <commands/common/CHIPCommand.h>
 #include <controller/CommissioningWindowOpener.h>
 #include <lib/support/CHIPMem.h>
 
diff --git a/examples/fabric-admin/commands/pairing/PairingCommand.cpp b/examples/fabric-admin/commands/pairing/PairingCommand.cpp
index 80775f0853d110..379b56431379e4 100644
--- a/examples/fabric-admin/commands/pairing/PairingCommand.cpp
+++ b/examples/fabric-admin/commands/pairing/PairingCommand.cpp
@@ -17,14 +17,14 @@
  */
 
 #include "PairingCommand.h"
-#include "platform/PlatformManager.h"
+
 #include <commands/common/DeviceScanner.h>
 #include <controller/ExampleOperationalCredentialsIssuer.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/logging/CHIPLogging.h>
+#include <platform/PlatformManager.h>
 #include <protocols/secure_channel/PASESession.h>
-
 #include <setup_payload/ManualSetupPayloadParser.h>
 #include <setup_payload/QRCodeSetupPayloadParser.h>
 
diff --git a/examples/fabric-admin/commands/pairing/PairingCommand.h b/examples/fabric-admin/commands/pairing/PairingCommand.h
index 4ff3903253be4e..8de34a0ba989ed 100644
--- a/examples/fabric-admin/commands/pairing/PairingCommand.h
+++ b/examples/fabric-admin/commands/pairing/PairingCommand.h
@@ -18,11 +18,10 @@
 
 #pragma once
 
-#include "../common/CHIPCommand.h"
+#include <commands/common/CHIPCommand.h>
+#include <commands/common/CredentialIssuerCommands.h>
 #include <controller/CommissioningDelegate.h>
 #include <controller/CurrentFabricRemover.h>
-
-#include <commands/common/CredentialIssuerCommands.h>
 #include <lib/support/Span.h>
 #include <lib/support/ThreadOperationalDataset.h>
 
diff --git a/examples/fabric-admin/main.cpp b/examples/fabric-admin/main.cpp
index cf1122bda1ec8a..a1002d83170d5b 100644
--- a/examples/fabric-admin/main.cpp
+++ b/examples/fabric-admin/main.cpp
@@ -16,11 +16,10 @@
  *
  */
 
-#include "commands/common/Commands.h"
-
-#include "commands/clusters/SubscriptionsCommands.h"
-#include "commands/interactive/Commands.h"
-#include "commands/pairing/Commands.h"
+#include <commands/clusters/SubscriptionsCommands.h>
+#include <commands/common/Commands.h>
+#include <commands/interactive/Commands.h>
+#include <commands/pairing/Commands.h>
 #include <zap-generated/cluster/Commands.h>
 
 #include <iostream>