diff --git a/chipset/bcm/bt_control_bcm.c b/chipset/bcm/bt_control_bcm.c
index 0684c3284..c807d932f 100644
--- a/chipset/bcm/bt_control_bcm.c
+++ b/chipset/bcm/bt_control_bcm.c
@@ -48,7 +48,7 @@
 #include <stdio.h> 
 #include <string.h>   /* memcpy */
 
-#include "bt_control.h"
+#include "btstack_control.h"
 #include "btstack_debug.h"
 
 // actual init script provided by separate bt_firmware_image.c from WICED SDK
diff --git a/chipset/bcm/bt_control_bcm.h b/chipset/bcm/bt_control_bcm.h
index 6de9f3370..fed795780 100644
--- a/chipset/bcm/bt_control_bcm.h
+++ b/chipset/bcm/bt_control_bcm.h
@@ -48,7 +48,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include "bt_control.h"
+#include "btstack_control.h"
 
 bt_control_t * bt_control_bcm_instance(void);
 
diff --git a/chipset/cc256x/bt_control_cc256x.c b/chipset/cc256x/bt_control_cc256x.c
index 88b693fdd..40a541e50 100644
--- a/chipset/cc256x/bt_control_cc256x.c
+++ b/chipset/cc256x/bt_control_cc256x.c
@@ -74,7 +74,7 @@
 #include <avr/pgmspace.h>
 #endif
 
-#include "bt_control.h"
+#include "btstack_control.h"
 
 
 // actual init script provided by seperate .c file
diff --git a/chipset/cc256x/bt_control_cc256x.h b/chipset/cc256x/bt_control_cc256x.h
index 7efa7b98e..f6d6cb63b 100644
--- a/chipset/cc256x/bt_control_cc256x.h
+++ b/chipset/cc256x/bt_control_cc256x.h
@@ -48,7 +48,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include "bt_control.h"
+#include "btstack_control.h"
 #include "hci_transport.h"
 
 bt_control_t *bt_control_cc256x_instance(void);
diff --git a/chipset/csr/bt_control_csr.c b/chipset/csr/bt_control_csr.c
index f119ec95a..8698be020 100644
--- a/chipset/csr/bt_control_csr.c
+++ b/chipset/csr/bt_control_csr.c
@@ -48,7 +48,7 @@
 #include <stdio.h> 
 #include <string.h>   /* memcpy */
 
-#include "bt_control.h"
+#include "btstack_control.h"
 #include "btstack_debug.h"
 #include "utils.h"
 
diff --git a/chipset/csr/bt_control_csr.h b/chipset/csr/bt_control_csr.h
index ffae2b42c..b4f2e99b7 100644
--- a/chipset/csr/bt_control_csr.h
+++ b/chipset/csr/bt_control_csr.h
@@ -49,7 +49,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include "bt_control.h"
+#include "btstack_control.h"
 #include "hci_transport.h"
 
 bt_control_t *     bt_control_csr_instance(void);
diff --git a/chipset/em9301/bt_control_em9301.h b/chipset/em9301/bt_control_em9301.h
index c0a72ef13..07bcd0a50 100644
--- a/chipset/em9301/bt_control_em9301.h
+++ b/chipset/em9301/bt_control_em9301.h
@@ -50,7 +50,7 @@
 extern "C" {
 #endif
 
-#include "bt_control.h"
+#include "btstack_control.h"
 
 bt_control_t *bt_control_em9301_instance(void);
 
diff --git a/chipset/stlc2500d/bt_control_stlc2500d.h b/chipset/stlc2500d/bt_control_stlc2500d.h
index 3f7cdcc73..6a484f54b 100644
--- a/chipset/stlc2500d/bt_control_stlc2500d.h
+++ b/chipset/stlc2500d/bt_control_stlc2500d.h
@@ -50,7 +50,7 @@
 extern "C" {
 #endif
 
-#include "bt_control.h"
+#include "btstack_control.h"
 
 bt_control_t *bt_control_stlc2500d_instance(void);
 
diff --git a/chipset/tc3556x/bt_control_tc3566x.h b/chipset/tc3556x/bt_control_tc3566x.h
index 2c127b136..8008e9517 100644
--- a/chipset/tc3556x/bt_control_tc3566x.h
+++ b/chipset/tc3556x/bt_control_tc3566x.h
@@ -52,7 +52,7 @@
 extern "C" {
 #endif
 
-#include "bt_control.h"
+#include "btstack_control.h"
 
 bt_control_t *bt_control_tc3566x_instance(void);
 
diff --git a/port/ios/src/bt_control_iphone.h b/port/ios/src/bt_control_iphone.h
index 86e67e9ef..f459b14ff 100644
--- a/port/ios/src/bt_control_iphone.h
+++ b/port/ios/src/bt_control_iphone.h
@@ -44,7 +44,7 @@
 #ifndef __BT_CONTROL_IPHONE_H
 #define __BT_CONTROL_IPHONE_H
  
-#include "bt_control.h"
+#include "btstack_control.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/src/btstack.h b/src/btstack.h
index 657b8b087..24a802832 100644
--- a/src/btstack.h
+++ b/src/btstack.h
@@ -47,7 +47,7 @@
 #include "btstack-config.h"
 
 #include "bluetooth.h"
-#include "bt_control.h"
+#include "btstack_control.h"
 #include "btstack.h"
 #include "btstack_defines.h"
 #include "btstack_memory.h"
diff --git a/src/bt_control.h b/src/btstack_control.h
similarity index 100%
rename from src/bt_control.h
rename to src/btstack_control.h
diff --git a/src/hci.h b/src/hci.h
index e1f042325..d86240bd8 100644
--- a/src/hci.h
+++ b/src/hci.h
@@ -48,7 +48,7 @@
 #include "btstack-config.h"
 
 
-#include "bt_control.h"
+#include "btstack_control.h"
 #include "classic/remote_device_db.h"
 #include "hci_cmds.h"
 #include "hci_transport.h"