diff --git a/examples/energy-management/electrical-sensor/BUILD.gn b/examples/energy-management/electrical-sensor/BUILD.gn
index f568722c36..13e0fdb4a5 100644
--- a/examples/energy-management/electrical-sensor/BUILD.gn
+++ b/examples/energy-management/electrical-sensor/BUILD.gn
@@ -21,8 +21,8 @@ config("config") {
 
 static_library("electrical-sensor") {
   sources = [
-    "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp",
-    "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp",
+    "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp",
+    "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp",
   ]
 
   public_configs = [ ":config" ]
diff --git a/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h b/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h
similarity index 98%
rename from examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h
rename to examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h
index ec5554e716..0abded9fe1 100644
--- a/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h
+++ b/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-#include <app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.h>
+#include <app/clusters/electrical-power-measurement-server/CodegenIntegration.h>
 #include <app/util/af-types.h>
 #include <lib/core/CHIPError.h>
 
diff --git a/examples/energy-management/electrical-sensor/include/PowerTopologyDelegate.h b/examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h
similarity index 100%
rename from examples/energy-management/electrical-sensor/include/PowerTopologyDelegate.h
rename to examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h
diff --git a/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp b/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp
similarity index 99%
rename from examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp
rename to examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp
index 045668e26a..c25dcf69b9 100644
--- a/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp
+++ b/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp
@@ -16,8 +16,9 @@
  *    limitations under the License.
  */
 
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <app/reporting/reporting.h>
+#include <clusters/ElectricalPowerMeasurement/Attributes.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp b/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp
similarity index 98%
rename from examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp
rename to examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp
index 758373df5f..d4620d6868 100644
--- a/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp
+++ b/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h b/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
index 1b551ab77e..f775ac08a1 100644
--- a/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
+++ b/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
@@ -20,9 +20,9 @@
 
 #include <DEMManufacturerDelegate.h>
 #include <DeviceEnergyManagementManager.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyEvseManager.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 
 using chip::Protocols::InteractionModel::Status;
 namespace chip {
diff --git a/examples/evse-app/evse-common/src/EnergyEvseMain.cpp b/examples/evse-app/evse-common/src/EnergyEvseMain.cpp
index 1de5e74102..1f9398169f 100644
--- a/examples/evse-app/evse-common/src/EnergyEvseMain.cpp
+++ b/examples/evse-app/evse-common/src/EnergyEvseMain.cpp
@@ -21,10 +21,10 @@
 #include <DeviceEnergyManagementDelegateImpl.h>
 #include <DeviceEnergyManagementManager.h>
 #include <EVSEManufacturerImpl.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyEvseManager.h>
 #include <EnergyManagementAppCmdLineOptions.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 #include <app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.h>
 #include <device-energy-management-modes.h>
 #include <energy-evse-modes.h>
@@ -32,12 +32,10 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/data-model/Nullable.h>
 #include <app/server/Server.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/Linux/NetworkCommissioningDriver.h>
 
 using namespace chip;
 using namespace chip::app;
diff --git a/examples/evse-app/silabs/src/AppTask.cpp b/examples/evse-app/silabs/src/AppTask.cpp
index 22c50bfe53..3145b36729 100644
--- a/examples/evse-app/silabs/src/AppTask.cpp
+++ b/examples/evse-app/silabs/src/AppTask.cpp
@@ -217,7 +217,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 
 void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)
 {
-    bool initiated = false;
     int32_t actor;
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -231,13 +230,7 @@ void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)
         err = APP_ERROR_UNHANDLED_EVENT;
     }
 
-    if (err == CHIP_NO_ERROR)
-    {
-        if (!initiated)
-        {
-            SILABS_LOG("Action is already in progress or active.");
-        }
-    }
+    // TODO: Implement evse action here (ex: Simulate car just plugged in or call event trigger)
 }
 
 void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
diff --git a/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp b/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
index a3ab45b848..a749ede2ee 100644
--- a/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
+++ b/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
@@ -23,9 +23,9 @@
 
 #include <DeviceEnergyManagementDelegateImpl.h>
 #include <DeviceEnergyManagementManager.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyManagementAppCmdLineOptions.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 #include <WaterHeaterInstance.h>
 #include <WaterHeaterMain.h>
 #include <WaterHeaterManufacturer.h>
diff --git a/src/app/clusters/mode-base-server/mode-base-server.cpp b/src/app/clusters/mode-base-server/mode-base-server.cpp
index b7d0a0b116..ffa00d2594 100644
--- a/src/app/clusters/mode-base-server/mode-base-server.cpp
+++ b/src/app/clusters/mode-base-server/mode-base-server.cpp
@@ -22,7 +22,9 @@
 #include <app/InteractionModelEngine.h>
 #include <app/SafeAttributePersistenceProvider.h>
 #include <app/clusters/mode-base-server/mode-base-server.h>
+#ifdef MATTER_DM_PLUGIN_ON_OFF_SERVER
 #include <app/clusters/on-off-server/on-off-server.h>
+#endif // MATTER_DM_PLUGIN_ON_OFF_SERVER
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
 #include <platform/DiagnosticDataProvider.h>
diff --git a/src/app/clusters/power-topology-server/CodegenIntegration.h b/src/app/clusters/power-topology-server/CodegenIntegration.h
index a5030fe8e9..e10c5cb23b 100644
--- a/src/app/clusters/power-topology-server/CodegenIntegration.h
+++ b/src/app/clusters/power-topology-server/CodegenIntegration.h
@@ -17,8 +17,6 @@
  */
 #pragma once
 
-#include <lib/core/Optional.h>
-
 #include <app/clusters/power-topology-server/PowerTopologyCluster.h>
 #include <app/clusters/power-topology-server/PowerTopologyDelegate.h>
 
diff --git a/src/app/clusters/power-topology-server/power-topology-server.h b/src/app/clusters/power-topology-server/power-topology-server.h
index 442e963356..3ab75d849e 100644
--- a/src/app/clusters/power-topology-server/power-topology-server.h
+++ b/src/app/clusters/power-topology-server/power-topology-server.h
@@ -15,4 +15,4 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include "CodegenIntegration.h"
+#include <app/clusters/power-topology-server/CodegenIntegration.h>