ifdef source files based on features

features/FEATURE_BLE/source/generic/FileSecurityDb.cpp

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#include "BLERoles.h"
+
+#if BLE_FEATURE_SECURITY
+
 #include "FileSecurityDb.h"
 
 namespace ble {
@@ -392,3 +396,5 @@ SecurityEntrySigning_t* FileSecurityDb::read_in_entry_peer_signing(entry_handle_
 
 } /* namespace pal */
 } /* namespace ble */
+
+#endif // BLE_FEATURE_SECURITY

features/FEATURE_BLE/source/generic/GenericGattClient.tpp

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#include "BLERoles.h"
+
+#if BLE_FEATURE_GATT_CLIENT
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -1498,3 +1502,4 @@ uint16_t GenericGattClient<TPalGattClient, SigningMonitorEventHandler>::get_mtu(
 } // namespace pal
 } // namespace ble
 
+#endif // BLE_FEATURE_GATT_SERVER

features/FEATURE_BLE/source/generic/GenericSecurityManager.tpp

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#include "BLERoles.h"
+
+#if BLE_FEATURE_SECURITY
+
 #include "ble/SecurityManager.h"
 #include "ble/pal/PalSecurityManager.h"
 #include "ble/generic/GenericSecurityManager.h"
@@ -1814,3 +1818,5 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::release_contro
 
 } /* namespace generic */
 } /* namespace ble */
+
+#endif // BLE_FEATURE_SECURITY

features/FEATURE_BLE/targets/TARGET_CORDIO/CordioGattServer.h

@@ -17,8 +17,6 @@
 #ifndef CORDIO_GATT_SERVER_H_
 #define CORDIO_GATT_SERVER_H_
 
-#if BLE_FEATURE_GATT_SERVER
-
 #include <stddef.h>
 #include "ble/blecommon.h"
 #include "ble/GattServer.h"
@@ -299,6 +297,4 @@ private:
 } // namespace vendor
 } // namespace ble
 
-#endif // BLE_FEATURE_GATT_SERVER
-
 #endif /* CORDIO_GATT_SERVER_H_ */

features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#include "BLERoles.h"
+
+#if BLE_FEATURE_GATT_SERVER
+
 #include <algorithm>
 #include "CordioBLE.h"
 #include "CordioGattServer.h"
@@ -1281,7 +1285,6 @@ bool GattServer::is_update_authorized(
     }
 }
 
-#if BLE_FEATURE_GATT_SERVER
 GattServer::GattServer() :
 #if BLE_FEATURE_SIGNING
     _signing_event_handler(NULL),
@@ -1299,9 +1302,9 @@ GattServer::GattServer() :
     currentHandle(0)
 {
 }
-#endif // BLE_FEATURE_GATT_SERVER
 
 } // namespace cordio
 } // namespace vendor
 } // namespace ble
 
+#endif // BLE_FEATURE_GATT_SERVER