diff --git a/src/platform/EFR32/BLEManagerImpl.cpp b/src/platform/EFR32/BLEManagerImpl.cpp
index 4c6493a16d2861..179ad1aa7ff0a5 100644
--- a/src/platform/EFR32/BLEManagerImpl.cpp
+++ b/src/platform/EFR32/BLEManagerImpl.cpp
@@ -22,16 +22,18 @@
  *          for the Silicon Labs EFR32 platforms.
  */
 
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+
 #include <platform/internal/BLEManager.h>
+
 #include <ble/CHIPBleServiceData.h>
+#include <platform/EFR32/freertos_bluetooth.h>
 #include <support/CodeUtils.h>
 #include <support/logging/CHIPLogging.h>
-#include <new>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 
-#include <platform/EFR32/freertos_bluetooth.h>
 #include "rtos_gecko.h"
 
 using namespace ::chip;
@@ -724,7 +726,6 @@ void BLEManagerImpl::HandleConnectionCloseEvent(volatile struct gecko_cmd_packet
 
 void BLEManagerImpl::HandleWriteEvent(volatile struct gecko_cmd_packet * evt)
 {
-    struct gecko_msg_gatt_server_read_attribute_type_rsp_t * rsp;
     uint16_t attribute = evt->data.evt_gatt_server_user_write_request.characteristic;
 
     ChipLogProgress(DeviceLayer, "Char Write Req, char : %d", attribute);
diff --git a/src/platform/EFR32/ConfigurationManagerImpl.cpp b/src/platform/EFR32/ConfigurationManagerImpl.cpp
index 9fc6aa8a58645a..b92d8bb850f243 100644
--- a/src/platform/EFR32/ConfigurationManagerImpl.cpp
+++ b/src/platform/EFR32/ConfigurationManagerImpl.cpp
@@ -21,13 +21,15 @@
  *          Provides the implementation of the Device Layer ConfigurationManager object
  *          for EFR32 platforms using the Silicon Labs SDK.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include <platform/internal/GenericConfigurationManagerImpl.ipp>
+
 #include <platform/ConfigurationManager.h>
-#include <platform/Profiles/security/CHIPApplicationKeys.h>
-#include <platform/EFR32/GroupKeyStoreImpl.h>
 #include <platform/EFR32/EFR32Config.h>
-#include <platform/internal/GenericConfigurationManagerImpl.ipp>
+#include <platform/EFR32/GroupKeyStoreImpl.h>
+#include <platform/Profiles/security/CHIPApplicationKeys.h>
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/EFR32/ConnectivityManagerImpl.cpp b/src/platform/EFR32/ConnectivityManagerImpl.cpp
index c8f48c7aeaf1ff..9aad176274eddc 100644
--- a/src/platform/EFR32/ConnectivityManagerImpl.cpp
+++ b/src/platform/EFR32/ConnectivityManagerImpl.cpp
@@ -15,20 +15,18 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
 #include <platform/ConnectivityManager.h>
 #include <platform/internal/BLEManager.h>
+#include <support/CodeUtils.h>
+#include <support/logging/CHIPLogging.h>
 
+#include <lwip/dns.h>
 #include <lwip/ip_addr.h>
-#include <lwip/netif.h>
 #include <lwip/nd6.h>
-#include <lwip/dns.h>
-
-#include <new>
-
-#include <support/logging/CHIPLogging.h>
-#include <support/CodeUtils.h>
+#include <lwip/netif.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 #include <platform/internal/GenericConnectivityManagerImpl_BLE.ipp>
diff --git a/src/platform/EFR32/EFR32Config.cpp b/src/platform/EFR32/EFR32Config.cpp
index 659e8481d9dce9..31a36216d2a91d 100644
--- a/src/platform/EFR32/EFR32Config.cpp
+++ b/src/platform/EFR32/EFR32Config.cpp
@@ -21,15 +21,17 @@
  *          Utilities for accessing persisted device configuration on
  *          platforms based on the Silicon Labs SDK.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
 #include <platform/EFR32/EFR32Config.h>
+
 #include <core/CHIPEncoding.h>
 #include <platform/internal/testing/ConfigUnitTest.h>
 
+#include "FreeRTOS.h"
 #include "nvm3.h"
 #include "nvm3_hal_flash.h"
-#include "FreeRTOS.h"
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/EFR32/Entropy.cpp b/src/platform/EFR32/Entropy.cpp
index 33117dcd0883b3..40b969711ec2d6 100644
--- a/src/platform/EFR32/Entropy.cpp
+++ b/src/platform/EFR32/Entropy.cpp
@@ -21,10 +21,13 @@
  *          Provides implementations for the Chip entropy sourcing functions
  *          on the Silcon Labs EFR32 platforms.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
 #include <support/crypto/CHIPRNG.h>
+
 #include <mbedtls/entropy_poll.h>
+
 #include <em_device.h>
 
 #if defined(_SILICON_LABS_32B_SERIES_1)
diff --git a/src/platform/EFR32/GroupKeyStoreImpl.cpp b/src/platform/EFR32/GroupKeyStoreImpl.cpp
index e2072eb8a4d671..df5b88db7e8193 100644
--- a/src/platform/EFR32/GroupKeyStoreImpl.cpp
+++ b/src/platform/EFR32/GroupKeyStoreImpl.cpp
@@ -21,8 +21,9 @@
  *          Provides an implementation of the CHIP GroupKeyStore interface
  *          for platforms based on the Silicon Labs SDK.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
 #include <platform/EFR32/GroupKeyStoreImpl.h>
 
 using namespace ::chip;
diff --git a/src/platform/EFR32/Logging.cpp b/src/platform/EFR32/Logging.cpp
index a4e29960aee36d..70ec4775225292 100644
--- a/src/platform/EFR32/Logging.cpp
+++ b/src/platform/EFR32/Logging.cpp
@@ -27,13 +27,15 @@
  *          logs wait indefinitely until a slot is available whereas
  *          non-error logs are dropped to avoid delays.
  */
-
-#include <stdio.h>
-#include <retargetserial.h>
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
 #include <support/logging/CHIPLogging.h>
-#include <task.h>
+
 #include <queue.h>
+#include <retargetserial.h>
+#include <stdio.h>
+#include <task.h>
 
 // RTT Buffer size and name
 #ifndef LOG_RTT_BUFFER_INDEX
diff --git a/src/platform/EFR32/NetworkProvisioningServerImpl.cpp b/src/platform/EFR32/NetworkProvisioningServerImpl.cpp
index 7b5de51b64b6c0..e90b259eee2947 100644
--- a/src/platform/EFR32/NetworkProvisioningServerImpl.cpp
+++ b/src/platform/EFR32/NetworkProvisioningServerImpl.cpp
@@ -15,14 +15,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
 #include <platform/internal/NetworkProvisioningServer.h>
-#include <platform/internal/DeviceNetworkInfo.h>
+
 #include <core/CHIPTLV.h>
 #include <platform/Profiles/CHIPProfiles.h>
 #include <platform/Profiles/common/CommonProfile.h>
-
+#include <platform/internal/DeviceNetworkInfo.h>
 #include <platform/internal/GenericNetworkProvisioningServerImpl.ipp>
 
 namespace chip {
diff --git a/src/platform/EFR32/PlatformManagerImpl.cpp b/src/platform/EFR32/PlatformManagerImpl.cpp
index 97b7667de9ff28..ead8c3069d9fc8 100644
--- a/src/platform/EFR32/PlatformManagerImpl.cpp
+++ b/src/platform/EFR32/PlatformManagerImpl.cpp
@@ -21,8 +21,9 @@
  *          Provides an implementation of the PlatformManager object
  *          for EFR32 platforms using the Silicon Labs EFR32 SDK.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+
 #include <platform/PlatformManager.h>
 #include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
 
diff --git a/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp b/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
index ac36446e612bbe..871f9d86e018d3 100644
--- a/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
+++ b/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
@@ -15,17 +15,17 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
 
+#include <platform/internal/GenericSoftwareUpdateManagerImpl.ipp>
+#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp>
+
 #include <platform/Profiles/CHIPProfiles.h>
 #include <platform/Profiles/common/CommonProfile.h>
 
-#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp>
-#include <platform/internal/GenericSoftwareUpdateManagerImpl.ipp>
-
 namespace chip {
 namespace DeviceLayer {
 
diff --git a/src/platform/EFR32/ThreadStackManagerImpl.cpp b/src/platform/EFR32/ThreadStackManagerImpl.cpp
index dbe2c7fb7444d7..57c6bfcc456129 100644
--- a/src/platform/EFR32/ThreadStackManagerImpl.cpp
+++ b/src/platform/EFR32/ThreadStackManagerImpl.cpp
@@ -23,14 +23,14 @@
  *          stack.
  *
  */
-
+/* this file behaves like a config.h, comes first */
 #include <platform/internal/CHIPDeviceLayerInternal.h>
-#include <platform/ThreadStackManager.h>
-#include <platform/OpenThread/OpenThreadUtils.h>
 
 #include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.ipp>
 #include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.ipp>
 
+#include <platform/OpenThread/OpenThreadUtils.h>
+
 namespace chip {
 namespace DeviceLayer {
 
diff --git a/src/platform/EFR32/freertos_bluetooth.c b/src/platform/EFR32/freertos_bluetooth.c
index cf0873174c295f..e7e9edeffdfe32 100644
--- a/src/platform/EFR32/freertos_bluetooth.c
+++ b/src/platform/EFR32/freertos_bluetooth.c
@@ -17,13 +17,14 @@
  *    limitations under the License.
  */
 
+#include <platform/EFR32/freertos_bluetooth.h>
+
+#include <em_device.h>
 #include <stdint.h>
 #include <string.h>
-#include <em_device.h>
 
-#include "rtos_gecko.h"
 #include "gecko_configuration.h"
-#include <platform/EFR32/freertos_bluetooth.h>
+#include "rtos_gecko.h"
 
 #ifdef CONFIGURATION_HEADER
 #include CONFIGURATION_HEADER
diff --git a/src/platform/EFR32/gatt_db.c b/src/platform/EFR32/gatt_db.c
index dbd1c7e7f0a89b..49d0152f187ac4 100644
--- a/src/platform/EFR32/gatt_db.c
+++ b/src/platform/EFR32/gatt_db.c
@@ -20,9 +20,10 @@
  * Autogenerated file, do not edit.
  *******************************************************************/
 
-#include <stdint.h>
 #include "bg_gattdb_def.h"
 
+#include <stdint.h>
+
 #define GATT_HEADER(F) F
 #define GATT_DATA(F) F
 GATT_DATA(const uint16_t bg_gattdb_data_uuidtable_16_map[]) = {