diff --git a/drivers/nble/conn.c b/drivers/nble/conn.c
index b9177b307ae..77372f50ef4 100644
--- a/drivers/nble/conn.c
+++ b/drivers/nble/conn.c
@@ -23,6 +23,7 @@
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
 
+#include "version.h"
 #include "gap_internal.h"
 #include "conn_internal.h"
 
diff --git a/drivers/nble/gap.c b/drivers/nble/gap.c
index 577ba304bcc..0ab6578f7d3 100644
--- a/drivers/nble/gap.c
+++ b/drivers/nble/gap.c
@@ -24,6 +24,7 @@
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
 
+#include "version.h"
 #include "gap_internal.h"
 #include "uart.h"
 #include "rpc.h"
diff --git a/drivers/nble/gap_internal.h b/drivers/nble/gap_internal.h
index 5e119e0f1d8..aae299912b4 100644
--- a/drivers/nble/gap_internal.h
+++ b/drivers/nble/gap_internal.h
@@ -18,12 +18,6 @@
  * limitations under the License.
  */
 
-#include <stdint.h>
-#include <stdbool.h>
-/* For bt_addr_le_t */
-#include "bluetooth/hci.h"
-#include "version.h"
-
 /* Maximum security key len (LTK, CSRK) */
 #define BLE_GAP_SEC_MAX_KEY_LEN		16
 
diff --git a/drivers/nble/gatt_internal.h b/drivers/nble/gatt_internal.h
index 008f1571e37..1de7518ed00 100644
--- a/drivers/nble/gatt_internal.h
+++ b/drivers/nble/gatt_internal.h
@@ -18,10 +18,6 @@
  * limitations under the License.
  */
 
-#include <stdint.h>
-
-#include <bluetooth/gatt.h>
-
 /* Max number of service supported, if changed update BLE core needs to be
  * updated too!
  */
diff --git a/drivers/nble/rpc_deserialize.c b/drivers/nble/rpc_deserialize.c
index d81bd37458c..d542f516bb8 100644
--- a/drivers/nble/rpc_deserialize.c
+++ b/drivers/nble/rpc_deserialize.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <bluetooth/gatt.h>
 /* for bt_security_t */
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
@@ -29,7 +30,7 @@
 #endif /* CONFIG_PRINTK */
 
 #include "rpc.h"
-
+#include "version.h"
 #include "gap_internal.h"
 #include "gatt_internal.h"
 
diff --git a/drivers/nble/rpc_serialize.c b/drivers/nble/rpc_serialize.c
index eb2d1375bc8..02a216ef305 100644
--- a/drivers/nble/rpc_serialize.c
+++ b/drivers/nble/rpc_serialize.c
@@ -16,10 +16,11 @@
 
 #include <string.h>
 
+#include <bluetooth/gatt.h>
 #include <bluetooth/conn.h>
 
 #include "rpc.h"
-
+#include "version.h"
 #include "gap_internal.h"
 #include "gatt_internal.h"
 
diff --git a/drivers/nble/stubs.c b/drivers/nble/stubs.c
index be84fc0e517..ea282a619ee 100644
--- a/drivers/nble/stubs.c
+++ b/drivers/nble/stubs.c
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+#include <bluetooth/gatt.h>
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
 
+#include "version.h"
 #include "gap_internal.h"
 #include "gatt_internal.h"