From 5bbe5c0d4a3f1376ebe90002703705ffcea4b6e0 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Wed, 13 May 2020 15:05:11 -0700
Subject: [PATCH 1/2] sort includes ble

---
 src/ble/BLEEndPoint.cpp       | 4 ++--
 src/ble/Ble.h                 | 3 +--
 src/ble/BleError.cpp          | 2 +-
 src/ble/BleLayer.cpp          | 6 +++---
 src/ble/BleLayer.h            | 4 ++--
 src/ble/BlePlatformDelegate.h | 2 +-
 src/ble/BtpEngine.cpp         | 2 +-
 src/ble/BtpEngine.h           | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp
index e81a8d2941b253..78d9058e67d682 100644
--- a/src/ble/BLEEndPoint.cpp
+++ b/src/ble/BLEEndPoint.cpp
@@ -36,10 +36,10 @@
 #if CONFIG_NETWORK_LAYER_BLE
 #include <core/CHIPConfig.h>
 
-#include <support/logging/CHIPLogging.h>
+#include <support/CHIPFaultInjection.h>
 #include <support/CodeUtils.h>
 #include <support/FlagUtils.hpp>
-#include <support/CHIPFaultInjection.h>
+#include <support/logging/CHIPLogging.h>
 
 #include <ble/BLEEndPoint.h>
 #include <ble/BleLayer.h>
diff --git a/src/ble/Ble.h b/src/ble/Ble.h
index cb718ba015cbce..e0b8b5bdcddc81 100644
--- a/src/ble/Ble.h
+++ b/src/ble/Ble.h
@@ -27,11 +27,10 @@
 #ifndef CHIP_BLE_H
 #define CHIP_BLE_H
 
+#include <ble/BLEEndPoint.h>
 #include <ble/BleApplicationDelegate.h>
 #include <ble/BleConfig.h>
-#include <ble/BLEEndPoint.h>
 #include <ble/BleError.h>
-#include <ble/Ble.h>
 #include <ble/BleLayer.h>
 #include <ble/BlePlatformDelegate.h>
 #include <ble/BleUUID.h>
diff --git a/src/ble/BleError.cpp b/src/ble/BleError.cpp
index 20092396533f0f..2a4b92dd19f5ee 100644
--- a/src/ble/BleError.cpp
+++ b/src/ble/BleError.cpp
@@ -27,8 +27,8 @@
 
 #if CONFIG_NETWORK_LAYER_BLE
 
-#include <ble/BleLayer.h>
 #include <ble/BleError.h>
+#include <ble/BleLayer.h>
 
 #include <support/ErrorStr.h>
 
diff --git a/src/ble/BleLayer.cpp b/src/ble/BleLayer.cpp
index 2aded35e16f2bd..bdfd1a8ebe8dac 100644
--- a/src/ble/BleLayer.cpp
+++ b/src/ble/BleLayer.cpp
@@ -56,15 +56,15 @@
 
 #include <string.h>
 
-#include <ble/BlePlatformDelegate.h>
+#include <ble/BLEEndPoint.h>
 #include <ble/BleApplicationDelegate.h>
 #include <ble/BleLayer.h>
+#include <ble/BlePlatformDelegate.h>
 #include <ble/BleUUID.h>
-#include <ble/BLEEndPoint.h>
 
 #include <core/CHIPEncoding.h>
-#include <support/logging/CHIPLogging.h>
 #include <support/CodeUtils.h>
+#include <support/logging/CHIPLogging.h>
 
 // clang-format off
 
diff --git a/src/ble/BleLayer.h b/src/ble/BleLayer.h
index 0a3c597e784ed2..59758f0a1928a7 100644
--- a/src/ble/BleLayer.h
+++ b/src/ble/BleLayer.h
@@ -58,10 +58,10 @@
 #include <system/SystemLayer.h>
 #include <system/SystemPacketBuffer.h>
 
-#include <ble/BlePlatformDelegate.h>
 #include <ble/BleApplicationDelegate.h>
-#include <ble/BleUUID.h>
 #include <ble/BleError.h>
+#include <ble/BlePlatformDelegate.h>
+#include <ble/BleUUID.h>
 
 #if BLE_CONFIG_PROVIDE_OBSOLESCENT_INTERFACES
 #include <inet/InetLayer.h>
diff --git a/src/ble/BlePlatformDelegate.h b/src/ble/BlePlatformDelegate.h
index ce163b30b3bdd8..eab78e6543aa73 100644
--- a/src/ble/BlePlatformDelegate.h
+++ b/src/ble/BlePlatformDelegate.h
@@ -29,8 +29,8 @@
 
 #include <ble/BleUUID.h>
 
-#include <system/SystemPacketBuffer.h>
 #include <support/DLLUtil.h>
+#include <system/SystemPacketBuffer.h>
 
 namespace chip {
 namespace Ble {
diff --git a/src/ble/BtpEngine.cpp b/src/ble/BtpEngine.cpp
index d086fadf42cef6..39485213b0b47f 100644
--- a/src/ble/BtpEngine.cpp
+++ b/src/ble/BtpEngine.cpp
@@ -34,8 +34,8 @@
 #include <ble/BtpEngineTest.h>
 #endif
 
-#include <support/logging/CHIPLogging.h>
 #include <support/CodeUtils.h>
+#include <support/logging/CHIPLogging.h>
 
 // Define below to enable extremely verbose BLE-specific debug logging.
 #undef CHIP_BTP_PROTOCOL_ENGINE_DEBUG_LOGGING_ENABLED
diff --git a/src/ble/BtpEngine.h b/src/ble/BtpEngine.h
index f8ac5bdc854934..a6e601c73649a9 100644
--- a/src/ble/BtpEngine.h
+++ b/src/ble/BtpEngine.h
@@ -38,8 +38,8 @@
 #include <ble/BleConfig.h>
 
 #include <ble/BleError.h>
-#include <system/SystemPacketBuffer.h>
 #include <support/FlagUtils.hpp>
+#include <system/SystemPacketBuffer.h>
 
 namespace chip {
 namespace Ble {

From deb51ed5ab92fd0bdbcc98046bb29e7dc62ea94d Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Wed, 13 May 2020 16:26:33 -0700
Subject: [PATCH 2/2] put config first, other nit

---
 src/ble/Ble.h                    | 3 ++-
 src/ble/BleApplicationDelegate.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ble/Ble.h b/src/ble/Ble.h
index e0b8b5bdcddc81..b019cb526c9711 100644
--- a/src/ble/Ble.h
+++ b/src/ble/Ble.h
@@ -27,9 +27,10 @@
 #ifndef CHIP_BLE_H
 #define CHIP_BLE_H
 
+#include <ble/BleConfig.h>
+
 #include <ble/BLEEndPoint.h>
 #include <ble/BleApplicationDelegate.h>
-#include <ble/BleConfig.h>
 #include <ble/BleError.h>
 #include <ble/BleLayer.h>
 #include <ble/BlePlatformDelegate.h>
diff --git a/src/ble/BleApplicationDelegate.h b/src/ble/BleApplicationDelegate.h
index a94ff7f495b692..1eb5ccbff9f8c7 100644
--- a/src/ble/BleApplicationDelegate.h
+++ b/src/ble/BleApplicationDelegate.h
@@ -25,9 +25,9 @@
 #ifndef BLEAPPLICATIONDELEGATE_H_
 #define BLEAPPLICATIONDELEGATE_H_
 
-#include <support/DLLUtil.h>
+#include <ble/BleConfig.h>
 
-#include "BleConfig.h"
+#include <support/DLLUtil.h>
 
 namespace chip {
 namespace Ble {