diff --git a/drivers/nble/gap.c b/drivers/nble/gap.c
index 7d0f04a4ecf..3dbcd86f355 100644
--- a/drivers/nble/gap.c
+++ b/drivers/nble/gap.c
@@ -24,8 +24,6 @@
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
 
-#include <net/buf.h>
-
 #include "gap_internal.h"
 #include "uart.h"
 #include "rpc.h"
diff --git a/drivers/nble/rpc_deserialize.c b/drivers/nble/rpc_deserialize.c
index f24edfaf254..362dfe131f3 100644
--- a/drivers/nble/rpc_deserialize.c
+++ b/drivers/nble/rpc_deserialize.c
@@ -26,6 +26,9 @@
 
 #include "rpc.h"
 
+#include "gap_internal.h"
+#include "gatt_internal.h"
+
 #include "rpc_functions_to_quark.h"
 
 /* Build the list of prototypes and check that list are made only of matching
diff --git a/drivers/nble/rpc_functions_to_ble_core.h b/drivers/nble/rpc_functions_to_ble_core.h
index d6bef43b4af..520d47db900 100644
--- a/drivers/nble/rpc_functions_to_ble_core.h
+++ b/drivers/nble/rpc_functions_to_ble_core.h
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include "gap_internal.h"
-#include "gatt_internal.h"
-
 /* declare the list of functions sorted by signature */
 #define LIST_FN_SIG_NONE
 
diff --git a/drivers/nble/rpc_functions_to_quark.h b/drivers/nble/rpc_functions_to_quark.h
index 9371c6abafb..55e38ddcb11 100644
--- a/drivers/nble/rpc_functions_to_quark.h
+++ b/drivers/nble/rpc_functions_to_quark.h
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include "gap_internal.h"
-#include "gatt_internal.h"
-
 /* declare the list of functions sorted by signature */
 #define LIST_FN_SIG_NONE					\
 	FN_SIG_NONE(on_nble_up)
diff --git a/drivers/nble/rpc_serialize.c b/drivers/nble/rpc_serialize.c
index 33d2e6ec440..2461976a54b 100644
--- a/drivers/nble/rpc_serialize.c
+++ b/drivers/nble/rpc_serialize.c
@@ -18,6 +18,9 @@
 
 #include "rpc.h"
 
+#include "gap_internal.h"
+#include "gatt_internal.h"
+
 #include "rpc_functions_to_ble_core.h"
 
 /* Build the functions exposed */