diff --git a/connectivity/FEATURE_BLE/include/ble/SecurityManager.h b/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
index c4baf45930..5f1efacb47 100644
--- a/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
+++ b/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
@@ -27,7 +27,6 @@
 #include "ble/common/ble/blecommon.h"
 
 #include "ble/common/ble/BLETypes.h"
-#include "ble/internal/SecurityDb.h"
 #include "ble/internal/PalConnectionMonitor.h"
 #include "ble/internal/PalSecurityManager.h"
 
diff --git a/connectivity/FEATURE_BLE/source/FileSecurityDb.cpp b/connectivity/FEATURE_BLE/source/generic/FileSecurityDb.cpp
similarity index 99%
rename from connectivity/FEATURE_BLE/source/FileSecurityDb.cpp
rename to connectivity/FEATURE_BLE/source/generic/FileSecurityDb.cpp
index a693f610d9..abae3e7020 100644
--- a/connectivity/FEATURE_BLE/source/FileSecurityDb.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/FileSecurityDb.cpp
@@ -18,7 +18,7 @@
 
 #if BLE_SECURITY_DATABASE_FILESYSTEM
 
-#include "ble/internal/FileSecurityDb.h"
+#include "FileSecurityDb.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/FileSecurityDb.h b/connectivity/FEATURE_BLE/source/generic/FileSecurityDb.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/internal/FileSecurityDb.h
rename to connectivity/FEATURE_BLE/source/generic/FileSecurityDb.h
index 59e043774e..f96a55385c 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/FileSecurityDb.h
+++ b/connectivity/FEATURE_BLE/source/generic/FileSecurityDb.h
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 
-#include "ble/internal/SecurityDb.h"
+#include "SecurityDb.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
index 04426a820b..9848cac80f 100644
--- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
@@ -1195,7 +1195,6 @@ ble_error_t GattClient::write(
     const uint8_t *value
 ) const
 {
-    // verify that there is no other procedures going on this connection
     if (_is_reseting || get_control_block(connection_handle)) {
         return BLE_ERROR_INVALID_STATE;
     }
@@ -1218,7 +1217,6 @@ ble_error_t GattClient::write(
         }
     }
 #endif // BLE_FEATURE_SIGNING
-
     if (cmd == GATT_OP_WRITE_CMD) {
         if (length > (uint16_t) (mtu - WRITE_HEADER_LENGTH)) {
             return BLE_ERROR_PARAM_OUT_OF_RANGE;
diff --git a/connectivity/FEATURE_BLE/source/KVStoreSecurityDb.cpp b/connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.cpp
similarity index 99%
rename from connectivity/FEATURE_BLE/source/KVStoreSecurityDb.cpp
rename to connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.cpp
index c1a5f2ce83..28db938881 100644
--- a/connectivity/FEATURE_BLE/source/KVStoreSecurityDb.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.cpp
@@ -18,7 +18,7 @@
 
 #if BLE_SECURITY_DATABASE_KVSTORE
 
-#include "ble/internal/KVStoreSecurityDb.h"
+#include "KVStoreSecurityDb.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/KVStoreSecurityDb.h b/connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/internal/KVStoreSecurityDb.h
rename to connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.h
index 0f0dfe6516..fa4a2bfb46 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/KVStoreSecurityDb.h
+++ b/connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.h
@@ -24,7 +24,7 @@
 #include "kvstore_global_api.h"
 #include "mbed_error.h"
 
-#include "ble/internal/SecurityDb.h"
+#include "SecurityDb.h"
 
 #define STR_EXPAND(tok) #tok
 #define STR(tok) STR_EXPAND(tok)
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/MemorySecurityDb.h b/connectivity/FEATURE_BLE/source/generic/MemorySecurityDb.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/internal/MemorySecurityDb.h
rename to connectivity/FEATURE_BLE/source/generic/MemorySecurityDb.h
index 37ad010dec..7c3431a3f7 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/MemorySecurityDb.h
+++ b/connectivity/FEATURE_BLE/source/generic/MemorySecurityDb.h
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MEMORY_SECURITY_DB_H_
 #define GENERIC_MEMORY_SECURITY_DB_H_
 
-#include "ble/internal/SecurityDb.h"
+#include "SecurityDb.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/SecurityDb.h b/connectivity/FEATURE_BLE/source/generic/SecurityDb.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/internal/SecurityDb.h
rename to connectivity/FEATURE_BLE/source/generic/SecurityDb.h
diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
index 78975efebf..3b17ebfc25 100644
--- a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
@@ -20,9 +20,9 @@
 
 #include "SecurityManagerImpl.h"
 #include "ble/internal/PalSecurityManager.h"
-#include "ble/internal/MemorySecurityDb.h"
-#include "ble/internal/FileSecurityDb.h"
-#include "ble/internal/KVStoreSecurityDb.h"
+#include "MemorySecurityDb.h"
+#include "FileSecurityDb.h"
+#include "KVStoreSecurityDb.h"
 
 using ble::advertising_peer_address_type_t;
 using ble::AuthenticationMask;
diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h
index adc00a26d9..ff612fa668 100644
--- a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h
+++ b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h
@@ -29,7 +29,7 @@
 
 #include "ble/common/ble/GapTypes.h"
 #include "ble/common/ble/BLETypes.h"
-#include "ble/internal/SecurityDb.h"
+#include "SecurityDb.h"
 #include "ble/internal/PalConnectionMonitor.h"
 #include "ble/internal/PalSigningMonitor.h"
 #include "ble/internal/PalSecurityManager.h"