diff --git a/MSP-EXP430F5438-CC256x/example-ant/btstack-config.h b/MSP-EXP430F5438-CC256x/example-ant/btstack-config.h
index 949dee741..ef136c616 100644
--- a/MSP-EXP430F5438-CC256x/example-ant/btstack-config.h
+++ b/MSP-EXP430F5438-CC256x/example-ant/btstack-config.h
@@ -1,3 +1,7 @@
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define EMBEDDED
 
 #define HAVE_INIT_SCRIPT
@@ -26,3 +30,4 @@
 #define MAX_NO_DB_MEM_DEVICE_NAMES 0
 #define MAX_NO_DB_MEM_SERVICES 1
 
+#endif
\ No newline at end of file
diff --git a/MSP-EXP430F5438-CC256x/example-ble/btstack-config.h b/MSP-EXP430F5438-CC256x/example-ble/btstack-config.h
index cc66f11a9..329c51498 100644
--- a/MSP-EXP430F5438-CC256x/example-ble/btstack-config.h
+++ b/MSP-EXP430F5438-CC256x/example-ble/btstack-config.h
@@ -1,3 +1,7 @@
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define EMBEDDED
 
 #define HAVE_INIT_SCRIPT
@@ -26,3 +30,4 @@
 #define MAX_NO_DB_MEM_DEVICE_NAMES 0
 #define MAX_NO_DB_MEM_SERVICES 0
 
+#endif
diff --git a/MSP-EXP430F5438-CC256x/example/btstack-config.h b/MSP-EXP430F5438-CC256x/example/btstack-config.h
index f75dfe432..3aad0bc34 100644
--- a/MSP-EXP430F5438-CC256x/example/btstack-config.h
+++ b/MSP-EXP430F5438-CC256x/example/btstack-config.h
@@ -1,3 +1,7 @@
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define EMBEDDED
 
 #define HAVE_INIT_SCRIPT
@@ -26,3 +30,5 @@
 #define MAX_NO_DB_MEM_DEVICE_NAMES 0
 #define MAX_NO_DB_MEM_SERVICES 1
 
+#endif
+
diff --git a/configure.ac b/configure.ac
index 5af6b88a4..0a426c7f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,15 @@ echo
 
 # create btstack-config.h
 rm -f btstack-config.h
-echo "// btstack-config.h created by configure for BTstack " `date`> btstack-config.h
+echo "//"                                       >> btstack-config.h
+echo "// btstack-config.h"                      >> btstack-config.h
+echo "// created by configure for BTstack "     >> btstack-config.h
+echo "//" `date`                                >> btstack-config.h
+echo "//"                                       >> btstack-config.h
+echo                                            >> btstack-config.h
+echo "#ifndef __BTSTACK_CONFIG"                 >> btstack-config.h
+echo "#define __BTSTACK_CONFIG"                 >> btstack-config.h
+echo                                            >> btstack-config.h
 if test "x$HCI_TRANSPORT" = xUSB; then
     USB_SOURCES=hci_transport_h2_libusb.c
     echo "#define HAVE_TRANSPORT_USB" >> btstack-config.h
@@ -153,6 +161,8 @@ echo "#define ENABLE_LOG_INFO " >> btstack-config.h
 echo "#define ENABLE_LOG_ERROR" >> btstack-config.h
 echo "#define HCI_ACL_PAYLOAD_SIZE 1021" >> btstack-config.h
 echo "#define SDP_DES_DUMP" >> btstack-config.h
+echo >> btstack-config.h
+echo "#endif" >> btstack-config.h
 
 AC_SUBST(HAVE_LIBUSB)
 AC_SUBST(REMOTE_DEVICE_DB_SOURCES)
diff --git a/eZ430-RF2560/example/btstack-config.h b/eZ430-RF2560/example/btstack-config.h
index 949dee741..639462661 100644
--- a/eZ430-RF2560/example/btstack-config.h
+++ b/eZ430-RF2560/example/btstack-config.h
@@ -1,3 +1,8 @@
+// config.h created by configure for BTstack  Tue Jun 4 23:10:20 CEST 2013
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define EMBEDDED
 
 #define HAVE_INIT_SCRIPT
@@ -26,3 +31,4 @@
 #define MAX_NO_DB_MEM_DEVICE_NAMES 0
 #define MAX_NO_DB_MEM_SERVICES 1
 
+#endif
\ No newline at end of file
diff --git a/example/libusb/btstack-config.h b/example/libusb/btstack-config.h
index 6562e4005..0ed35fe2d 100644
--- a/example/libusb/btstack-config.h
+++ b/example/libusb/btstack-config.h
@@ -1,4 +1,8 @@
 // config.h created by configure for BTstack  Tue Jun 4 23:10:20 CEST 2013
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define HAVE_TRANSPORT_USB
 #define HAVE_BLE
 #define USE_POSIX_RUN_LOOP
@@ -14,4 +18,6 @@
 #define ENABLE_LOG_ERROR
 #define HCI_ACL_PAYLOAD_SIZE 1021
 #define HAVE_HCI_DUMP
-#define SDP_DES_DUMP
\ No newline at end of file
+#define SDP_DES_DUMP
+
+#endif
\ No newline at end of file
diff --git a/platforms/ios/btstack-config-iphone.h b/platforms/ios/btstack-config-iphone.h
index ee4fb748c..539ce57c9 100644
--- a/platforms/ios/btstack-config-iphone.h
+++ b/platforms/ios/btstack-config-iphone.h
@@ -1,4 +1,12 @@
-// btstack-config.h created by configure for BTstack  Sun Jan 19 18:35:17 CET 2014
+//
+// btstack-config.h
+// created by configure for BTstack 
+// Tue Oct 14 21:52:44 CEST 2014
+//
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define HAVE_TRANSPORT_H4
 #define UART_DEVICE "/dev/tty.bluetooth"
 #define UART_SPEED 921600
@@ -19,3 +27,5 @@
 #define ENABLE_LOG_ERROR
 #define HCI_ACL_PAYLOAD_SIZE 1021
 #define SDP_DES_DUMP
+
+#endif
\ No newline at end of file
diff --git a/platforms/stm32-f103rb-nucleo/btstack-config.h b/platforms/stm32-f103rb-nucleo/btstack-config.h
index 40dbf0335..c804f5663 100644
--- a/platforms/stm32-f103rb-nucleo/btstack-config.h
+++ b/platforms/stm32-f103rb-nucleo/btstack-config.h
@@ -1,3 +1,6 @@
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define EMBEDDED
 
 #define HAVE_BLE
@@ -27,3 +30,5 @@
 #define MAX_NO_DB_MEM_SERVICES 1
 #define MAX_NO_BNEP_SERVICES 0
 #define MAX_NO_BNEP_CHANNELS 0
+
+#endif
\ No newline at end of file
diff --git a/test/des_iterator/btstack-config.h b/test/des_iterator/btstack-config.h
index 3fa069bfa..584064ba8 100644
--- a/test/des_iterator/btstack-config.h
+++ b/test/des_iterator/btstack-config.h
@@ -1,6 +1,9 @@
 // config.h created by configure for BTstack  Sun Sep 25 16:06:59 CEST 2011
-#ifndef __CONFIG_H
-#define __CONFIG_H
+
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define HAVE_TRANSPORT_H4
 #define UART_DEVICE "/dev/tty.usbserial-A600eIDu"
 #define UART_SPEED 115200
@@ -15,4 +18,4 @@
 #define HCI_ACL_PAYLOAD_SIZE 1021
 // #define HCI_ACL_PAYLOAD_SIZE 52
 
-#endif // __CONFIG_H
+#endif
diff --git a/test/sdp_client/btstack-config.h b/test/sdp_client/btstack-config.h
index 3fa069bfa..8ad7a96d9 100644
--- a/test/sdp_client/btstack-config.h
+++ b/test/sdp_client/btstack-config.h
@@ -1,6 +1,8 @@
 // config.h created by configure for BTstack  Sun Sep 25 16:06:59 CEST 2011
-#ifndef __CONFIG_H
-#define __CONFIG_H
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define HAVE_TRANSPORT_H4
 #define UART_DEVICE "/dev/tty.usbserial-A600eIDu"
 #define UART_SPEED 115200
@@ -15,4 +17,4 @@
 #define HCI_ACL_PAYLOAD_SIZE 1021
 // #define HCI_ACL_PAYLOAD_SIZE 52
 
-#endif // __CONFIG_H
+#endif
diff --git a/test/security_manager/btstack-config.h b/test/security_manager/btstack-config.h
index 6562e4005..3654bbaf6 100644
--- a/test/security_manager/btstack-config.h
+++ b/test/security_manager/btstack-config.h
@@ -1,4 +1,8 @@
 // config.h created by configure for BTstack  Tue Jun 4 23:10:20 CEST 2013
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
 #define HAVE_TRANSPORT_USB
 #define HAVE_BLE
 #define USE_POSIX_RUN_LOOP
@@ -14,4 +18,6 @@
 #define ENABLE_LOG_ERROR
 #define HCI_ACL_PAYLOAD_SIZE 1021
 #define HAVE_HCI_DUMP
-#define SDP_DES_DUMP
\ No newline at end of file
+#define SDP_DES_DUMP
+
+#endif