diff --git a/platform/daemon/src/daemon_cmds.c b/platform/daemon/src/daemon_cmds.c
new file mode 100644
index 000000000..8ca684577
--- /dev/null
+++ b/platform/daemon/src/daemon_cmds.c
@@ -0,0 +1,474 @@
+/*
+ * Copyright (C) 2014 BlueKitchen GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ * 4. Any redistribution, use, or modification is done solely for
+ *    personal benefit and not for any commercial purpose or for
+ *    monetary gain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS
+ * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Please inquire about commercial licensing options at 
+ * contact@bluekitchen-gmbh.com
+ *
+ */
+
+/*
+ *  hci_cmds.c
+ *
+ *  Created by Matthias Ringwald on 7/23/09.
+ */
+
+#include "daemon_cmds.h"
+#include "hci.h"
+ 
+// calculate combined ogf/ocf value
+#define OPCODE(ogf, ocf) (ocf | ogf << 10)
+
+// BTstack commands
+const hci_cmd_t btstack_get_state = {
+OPCODE(OGF_BTSTACK, BTSTACK_GET_STATE), ""
+};
+
+/**
+ * @param power_mode (0 = off, 1 = on)
+ */
+const hci_cmd_t btstack_set_power_mode = {
+OPCODE(OGF_BTSTACK, BTSTACK_SET_POWER_MODE), "1"
+};
+
+/**
+ * @param acl_capture_mode (0 = off, 1 = on)
+ */
+const hci_cmd_t btstack_set_acl_capture_mode = {
+OPCODE(OGF_BTSTACK, BTSTACK_SET_ACL_CAPTURE_MODE), "1"
+};
+
+const hci_cmd_t btstack_get_version = {
+OPCODE(OGF_BTSTACK, BTSTACK_GET_VERSION), ""
+};
+
+const hci_cmd_t btstack_get_system_bluetooth_enabled = {
+OPCODE(OGF_BTSTACK, BTSTACK_GET_SYSTEM_BLUETOOTH_ENABLED), ""
+};
+
+/**
+ * @param bluetooth_enabled_flag (0 = off, 1 = on, only used by btstack config)
+ */
+const hci_cmd_t btstack_set_system_bluetooth_enabled = {
+OPCODE(OGF_BTSTACK, BTSTACK_SET_SYSTEM_BLUETOOTH_ENABLED), "1"
+};
+
+/**
+ * @param discoverable_flag (0 = off, 1 = on)
+ */
+const hci_cmd_t btstack_set_discoverable = {
+OPCODE(OGF_BTSTACK, BTSTACK_SET_DISCOVERABLE), "1"
+};
+
+/**
+ * @param bluetooth_enabled_flag (0 = off, 1 = on, only used by btstack config)
+ */
+const hci_cmd_t btstack_set_bluetooth_enabled = {
+OPCODE(OGF_BTSTACK, BTSTACK_SET_BLUETOOTH_ENABLED), "1"
+};
+
+/**
+ * @param bd_addr (48)
+ * @param psm (16)
+ */
+const hci_cmd_t l2cap_create_channel_cmd = {
+OPCODE(OGF_BTSTACK, L2CAP_CREATE_CHANNEL), "B2"
+};
+
+/**
+ * @param bd_addr (48)
+ * @param psm (16)
+ * @param mtu (16)
+ */
+const hci_cmd_t l2cap_create_channel_mtu_cmd = {
+OPCODE(OGF_BTSTACK, L2CAP_CREATE_CHANNEL_MTU), "B22"
+// @param bd_addr(48), psm (16), mtu (16)
+};
+
+/**
+ * @param channel (16)
+ * @param reason (16)
+ */
+const hci_cmd_t l2cap_disconnect_cmd = {
+OPCODE(OGF_BTSTACK, L2CAP_DISCONNECT), "21"
+};
+
+/**
+ * @param psm (16)
+ * @param mtu (16)
+ */
+const hci_cmd_t l2cap_register_service_cmd = {
+OPCODE(OGF_BTSTACK, L2CAP_REGISTER_SERVICE), "22"
+};
+
+/**
+ * @param psm (16)
+ */
+const hci_cmd_t l2cap_unregister_service_cmd = {
+OPCODE(OGF_BTSTACK, L2CAP_UNREGISTER_SERVICE), "2"
+};
+
+/**
+ * @param source_cid (16)
+ */
+const hci_cmd_t l2cap_accept_connection_cmd = {
+OPCODE(OGF_BTSTACK, L2CAP_ACCEPT_CONNECTION), "2"
+};
+
+/**
+ * @param source_cid (16)
+ * @param reason
+ */
+const hci_cmd_t l2cap_decline_connection_cmd = {
+OPCODE(OGF_BTSTACK, L2CAP_DECLINE_CONNECTION), "21"
+};
+
+
+/**
+ * @param service_record
+ */
+const hci_cmd_t sdp_register_service_record_cmd = {
+OPCODE(OGF_BTSTACK, SDP_REGISTER_SERVICE_RECORD), "S"
+};
+
+/**
+ * @param service_record_handle
+ */
+const hci_cmd_t sdp_unregister_service_record_cmd = {
+OPCODE(OGF_BTSTACK, SDP_UNREGISTER_SERVICE_RECORD), "4"
+};
+
+/**
+ * @param bd_addr
+ * @param service_search_pattern
+ */
+const hci_cmd_t sdp_client_query_rfcomm_services_cmd = {
+OPCODE(OGF_BTSTACK, SDP_CLIENT_QUERY_RFCOMM_SERVICES), "BS"
+};
+
+/**
+ * @param bd_addr
+ * @param service_search_pattern
+ * @param attribute_ID_list
+ */
+const hci_cmd_t sdp_client_query_services_cmd = {
+OPCODE(OGF_BTSTACK, SDP_CLIENT_QUERY_SERVICES), "BSS"
+};
+
+/**
+ * @param bd_addr
+ * @param server_channel
+ */
+const hci_cmd_t rfcomm_create_channel_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_CREATE_CHANNEL), "B1"
+};
+
+/**
+ * @param bd_addr
+ * @param server_channel
+ * @param mtu
+ * @param credits
+ */
+const hci_cmd_t rfcomm_create_channel_with_initial_credits_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_CREATE_CHANNEL_WITH_CREDITS), "B121"
+};
+
+/**
+ * @param rfcomm_cid
+ * @param credits
+ */
+const hci_cmd_t rfcomm_grants_credits_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_GRANT_CREDITS), "21"
+};
+
+/**
+ * @param rfcomm_cid
+ * @param reason
+ */
+const hci_cmd_t rfcomm_disconnect_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_DISCONNECT), "21"
+};
+
+/**
+ * @param server_channel
+ * @param mtu
+ */
+const hci_cmd_t rfcomm_register_service_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_REGISTER_SERVICE), "12"
+};
+
+/**
+ * @param server_channel
+ * @param mtu
+ * @param initial_credits
+ */
+const hci_cmd_t rfcomm_register_service_with_initial_credits_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_REGISTER_SERVICE_WITH_CREDITS), "121"
+};
+
+/**
+ * @param service_channel
+ */
+const hci_cmd_t rfcomm_unregister_service_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_UNREGISTER_SERVICE), "2"
+};
+
+/**
+ * @param source_cid
+ */
+const hci_cmd_t rfcomm_accept_connection_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_ACCEPT_CONNECTION), "2"
+};
+
+
+/**
+ * @param source_cid
+ * @param reason
+ */
+const hci_cmd_t rfcomm_decline_connection_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_DECLINE_CONNECTION), "21"
+};
+
+// request persistent rfcomm channel number for named service
+/**
+ * @param named_service
+ */
+const hci_cmd_t rfcomm_persistent_channel_for_service_cmd = {
+OPCODE(OGF_BTSTACK, RFCOMM_PERSISTENT_CHANNEL), "N"
+};
+
+/**
+ * @param handle
+ */
+const hci_cmd_t gap_disconnect_cmd = {
+OPCODE(OGF_BTSTACK, GAP_DISCONNECT), "H"
+};
+
+/**
+ */
+const hci_cmd_t gap_le_scan_start = {
+OPCODE(OGF_BTSTACK, GAP_LE_SCAN_START), ""
+};
+
+/**
+ */
+const hci_cmd_t gap_le_scan_stop = {
+OPCODE(OGF_BTSTACK, GAP_LE_SCAN_STOP), ""
+};
+
+/**
+ * @param scan_type
+ * @param scan_interval
+ * @param scan_window
+ */
+const hci_cmd_t gap_le_set_scan_parameters = {
+OPCODE(OGF_BTSTACK, GAP_LE_SET_SCAN_PARAMETERS), "122"
+};
+
+/**
+ * @param peer_address_type
+ * @param peer_address
+ */
+const hci_cmd_t gap_le_connect_cmd = {
+OPCODE(OGF_BTSTACK, GAP_LE_CONNECT), "1B"
+};
+
+/**
+ * @param peer_address_type
+ * @param peer_address
+ */
+const hci_cmd_t gap_le_connect_cancel_cmd = {
+OPCODE(OGF_BTSTACK, GAP_LE_CONNECT_CANCEL), ""
+};
+
+/**
+ * @param handle
+ */
+const hci_cmd_t gatt_discover_primary_services_cmd = {
+OPCODE(OGF_BTSTACK, GATT_DISCOVER_ALL_PRIMARY_SERVICES), "H"
+};
+
+/**
+ * @param handle
+ * @param uuid16
+ */
+const hci_cmd_t gatt_discover_primary_services_by_uuid16_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_DISCOVER_PRIMARY_SERVICES_BY_UUID16), "H2"
+};
+
+/**
+ * @param handle
+ * @param uuid128
+ */
+const hci_cmd_t gatt_discover_primary_services_by_uuid128_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_DISCOVER_PRIMARY_SERVICES_BY_UUID128), "HU"
+};
+
+/**
+ * @param handle
+ * @param service
+ */
+const hci_cmd_t gatt_find_included_services_for_service_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_FIND_INCLUDED_SERVICES_FOR_SERVICE), "HX"
+};
+
+/**
+ * @param handle
+ * @param service
+ */
+const hci_cmd_t gatt_discover_characteristics_for_service_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTICS_FOR_SERVICE), "HX"
+};
+
+/**
+ * @param handle
+ * @param service
+ * @param uuid128
+ */
+const hci_cmd_t gatt_discover_characteristics_for_service_by_uuid128_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTICS_FOR_SERVICE_BY_UUID128), "HXU"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ */
+const hci_cmd_t gatt_discover_characteristic_descriptors_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTIC_DESCRIPTORS), "HY"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ */
+const hci_cmd_t gatt_read_value_of_characteristic_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_READ_VALUE_OF_CHARACTERISTIC), "HY"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ */
+const hci_cmd_t gatt_read_long_value_of_characteristic_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_READ_LONG_VALUE_OF_CHARACTERISTIC), "HY"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ * @param data_length
+ * @param data
+ */
+const hci_cmd_t gatt_write_value_of_characteristic_without_response_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_WRITE_VALUE_OF_CHARACTERISTIC_WITHOUT_RESPONSE), "HYLV"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ * @param data_length
+ * @param data
+ */
+const hci_cmd_t gatt_write_value_of_characteristic_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_WRITE_VALUE_OF_CHARACTERISTIC), "HYLV"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ * @param data_length
+ * @param data
+ */
+const hci_cmd_t gatt_write_long_value_of_characteristic_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_WRITE_LONG_VALUE_OF_CHARACTERISTIC), "HYLV"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ * @param data_length
+ * @param data
+ */
+const hci_cmd_t gatt_reliable_write_long_value_of_characteristic_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_RELIABLE_WRITE_LONG_VALUE_OF_CHARACTERISTIC), "HYLV"
+};
+
+/**
+ * @param handle
+ * @param descriptor
+ */
+const hci_cmd_t gatt_read_characteristic_descriptor_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_READ_CHARACTERISTIC_DESCRIPTOR), "HZ"
+};
+
+/**
+ * @param handle
+ * @param descriptor
+ */
+const hci_cmd_t gatt_read_long_characteristic_descriptor_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_READ_LONG_CHARACTERISTIC_DESCRIPTOR), "HZ"
+};
+
+/**
+ * @param handle
+ * @param descriptor
+ * @param data_length
+ * @param data
+ */
+const hci_cmd_t gatt_write_characteristic_descriptor_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_WRITE_CHARACTERISTIC_DESCRIPTOR), "HZLV"
+};
+
+/**
+ * @param handle
+ * @param descriptor
+ * @param data_length
+ * @param data
+ */
+const hci_cmd_t gatt_write_long_characteristic_descriptor_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_WRITE_LONG_CHARACTERISTIC_DESCRIPTOR), "HZLV"
+};
+
+/**
+ * @param handle
+ * @param characteristic
+ * @param configuration
+ */
+const hci_cmd_t gatt_write_client_characteristic_configuration_cmd = {
+    OPCODE(OGF_BTSTACK, GATT_WRITE_CLIENT_CHARACTERISTIC_CONFIGURATION), "HY2"
+};
+
+/**
+ * @param handle
+ */
+const hci_cmd_t gatt_get_mtu = {
+    OPCODE(OGF_BTSTACK, GATT_GET_MTU), "H"
+};
diff --git a/platform/daemon/src/daemon_cmds.h b/platform/daemon/src/daemon_cmds.h
new file mode 100644
index 000000000..8bd05466d
--- /dev/null
+++ b/platform/daemon/src/daemon_cmds.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2014 BlueKitchen GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ * 4. Any redistribution, use, or modification is done solely for
+ *    personal benefit and not for any commercial purpose or for
+ *    monetary gain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS
+ * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Please inquire about commercial licensing options at 
+ * contact@bluekitchen-gmbh.com
+ *
+ */
+
+/*
+ *  daemon_cmds.h
+ */
+
+#ifndef __DAEMON_CMDS_H
+#define __DAEMON_CMDS_H
+
+#include <stdint.h>
+
+#include "bluetooth.h"
+#include "hci_cmds.h"
+
+#if defined __cplusplus
+extern "C" {
+#endif
+    
+extern const hci_cmd_t btstack_get_state;
+extern const hci_cmd_t btstack_set_power_mode;
+extern const hci_cmd_t btstack_set_acl_capture_mode;
+extern const hci_cmd_t btstack_get_version;
+extern const hci_cmd_t btstack_get_system_bluetooth_enabled;
+extern const hci_cmd_t btstack_set_system_bluetooth_enabled;
+extern const hci_cmd_t btstack_set_discoverable;
+extern const hci_cmd_t btstack_set_bluetooth_enabled;    // only used by btstack config
+
+extern const hci_cmd_t l2cap_accept_connection_cmd;
+extern const hci_cmd_t l2cap_create_channel_cmd;
+extern const hci_cmd_t l2cap_create_channel_mtu_cmd;
+extern const hci_cmd_t l2cap_decline_connection_cmd;
+extern const hci_cmd_t l2cap_disconnect_cmd;
+extern const hci_cmd_t l2cap_register_service_cmd;
+extern const hci_cmd_t l2cap_unregister_service_cmd;
+
+extern const hci_cmd_t sdp_register_service_record_cmd;
+extern const hci_cmd_t sdp_unregister_service_record_cmd;
+extern const hci_cmd_t sdp_client_query_rfcomm_services_cmd;
+extern const hci_cmd_t sdp_client_query_services_cmd;
+
+// accept connection @param bd_addr(48), rfcomm_cid (16)
+extern const hci_cmd_t rfcomm_accept_connection_cmd;
+// create rfcomm channel: @param bd_addr(48), channel (8)
+extern const hci_cmd_t rfcomm_create_channel_cmd;
+// create rfcomm channel: @param bd_addr(48), channel (8), mtu (16), credits (8)
+extern const hci_cmd_t rfcomm_create_channel_with_initial_credits_cmd;
+// decline rfcomm disconnect,@param bd_addr(48), rfcomm cid (16), reason(8)
+extern const hci_cmd_t rfcomm_decline_connection_cmd;
+// disconnect rfcomm disconnect, @param rfcomm_cid(8), reason(8)
+extern const hci_cmd_t rfcomm_disconnect_cmd;
+// register rfcomm service: @param channel(8), mtu (16)
+extern const hci_cmd_t rfcomm_register_service_cmd;
+// register rfcomm service: @param channel(8), mtu (16), initial credits (8)
+extern const hci_cmd_t rfcomm_register_service_with_initial_credits_cmd;
+// unregister rfcomm service, @param service_channel(16)
+extern const hci_cmd_t rfcomm_unregister_service_cmd;
+// request persisten rfcomm channel for service name: serive name (char*) 
+extern const hci_cmd_t rfcomm_persistent_channel_for_service_cmd;
+extern const hci_cmd_t rfcomm_grants_credits_cmd;
+
+extern const hci_cmd_t gap_disconnect_cmd;
+extern const hci_cmd_t gap_le_scan_start;
+extern const hci_cmd_t gap_le_scan_stop;
+extern const hci_cmd_t gap_le_set_scan_parameters;
+extern const hci_cmd_t gap_le_connect_cmd;
+extern const hci_cmd_t gap_le_connect_cancel_cmd;
+extern const hci_cmd_t gatt_discover_primary_services_cmd;
+
+extern const hci_cmd_t gatt_discover_primary_services_by_uuid16_cmd;
+extern const hci_cmd_t gatt_discover_primary_services_by_uuid128_cmd;
+extern const hci_cmd_t gatt_find_included_services_for_service_cmd;
+extern const hci_cmd_t gatt_discover_characteristics_for_service_cmd;
+extern const hci_cmd_t gatt_discover_characteristics_for_service_by_uuid128_cmd;
+extern const hci_cmd_t gatt_discover_characteristic_descriptors_cmd;
+extern const hci_cmd_t gatt_read_value_of_characteristic_cmd;
+extern const hci_cmd_t gatt_read_long_value_of_characteristic_cmd;
+extern const hci_cmd_t gatt_write_value_of_characteristic_without_response_cmd;
+extern const hci_cmd_t gatt_write_value_of_characteristic_cmd;
+extern const hci_cmd_t gatt_write_long_value_of_characteristic_cmd;
+extern const hci_cmd_t gatt_reliable_write_long_value_of_characteristic_cmd;
+extern const hci_cmd_t gatt_read_characteristic_descriptor_cmd;
+extern const hci_cmd_t gatt_read_long_characteristic_descriptor_cmd;
+extern const hci_cmd_t gatt_write_characteristic_descriptor_cmd;
+extern const hci_cmd_t gatt_write_long_characteristic_descriptor_cmd;
+extern const hci_cmd_t gatt_write_client_characteristic_configuration_cmd;
+extern const hci_cmd_t gatt_get_mtu;
+
+
+#if defined __cplusplus
+}
+#endif
+
+#endif // __DAEMON_CMDS_H
diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in
index 50bc5ac88..a0a68a37e 100644
--- a/port/daemon/src/Makefile.in
+++ b/port/daemon/src/Makefile.in
@@ -28,6 +28,7 @@ libBTstack_SOURCES =    \
     btstack.c           \
     socket_connection.c \
     hci_cmds.c          \
+    daemon_cmds.c       \
     linked_list.c       \
     run_loop.c          \
     sdp_util.c          \
diff --git a/port/ios/src/Makefile b/port/ios/src/Makefile
index 2ebe10c30..0f3c1193c 100644
--- a/port/ios/src/Makefile
+++ b/port/ios/src/Makefile
@@ -7,24 +7,27 @@ TARGET_IPHONEOS_DEPLOYMENT_VERSION_arm64 = 7.0
 ARCHS = armv6 arm64
 
 BTSTACK_ROOT=../../..
-POSIX_ROOT=$(BTSTACK_ROOT)/platform/posix
-DAEMON_ROOT=$(BTSTACK_ROOT)/platform/daemon
 
 VPATH += $(BTSTACK_ROOT)/src \
-		 $(BTSTACK_ROOT)/src/classic 
+		 $(BTSTACK_ROOT)/src/classic \
+		 $(BTSTACK_ROOT)/platform/posix/src \
+		 $(BTSTACK_ROOT)/platform/daemon/src \
+		 $(BTSTACK_ROOT)/platform/cocoa \
+		 $(BTSTACK_ROOT)/port/ios/SpringBoardAccess
 
 LIBRARY_NAME = libBTstack
 libBTstack_FILES = \
+	daemon_cmds.c \
 	hci_cmds.c \
 	hci_dump.c \
 	linked_list.c \
 	run_loop.c \
 	sdp_util.c \
 	utils.c \
-	$(BTSTACK_ROOT)/platform/cocoa/run_loop_cocoa.m \
-	$(POSIX_ROOT)/src/run_loop_posix.c \
-	$(DAEMON_ROOT)/src/btstack.c \
-	$(DAEMON_ROOT)/src/socket_connection.c \
+	run_loop_cocoa.m \
+	run_loop_posix.c \
+	btstack.c \
+	socket_connection.c \
 
 libBTstack_CFLAGS = -I$(BTSTACK_ROOT)/src/ble -I$(BTSTACK_ROOT)/src -I..
 
@@ -42,13 +45,13 @@ BTdaemon_FILES = \
     sdp_parser.c            \
     sdp_query_rfcomm.c      \
     sdp_query_util.c        \
-	$(DAEMON_ROOT)/src/daemon.c  \
-	$(POSIX_ROOT)/src/hci_transport_h4.c 		 	\
-	$(BTSTACK_ROOT)/port/ios/src/bt_control_iphone.m     	\
-	$(BTSTACK_ROOT)/port/ios/src/hci_transport_h4_iphone.c  \
-	$(BTSTACK_ROOT)/port/ios/src/platform_iphone.m       	\
-	$(BTSTACK_ROOT)/port/ios/SpringBoardAccess/SpringBoardAccess.c \
-	$(BTSTACK_ROOT)/platform/cocoa/remote_device_db_cocoa.m  	\
+	daemon.c  				    \
+	hci_transport_h4.c 		 	\
+	bt_control_iphone.m     	\
+	hci_transport_h4_iphone.c   \
+	platform_iphone.m       	\
+	SpringBoardAccess.c         \
+	remote_device_db_cocoa.m  	\
 
 BTdaemon_CFLAGS = -I$(BTSTACK_ROOT)/src -I$(BTSTACK_ROOT)/platform/daemon/src -I..
 BTdaemon_PRIVATE_FRAMEWORKS = IOKIT
diff --git a/src/hci_cmds.c b/src/hci_cmds.c
index 78c526be8..421ed216b 100644
--- a/src/hci_cmds.c
+++ b/src/hci_cmds.c
@@ -1007,431 +1007,3 @@ OPCODE(OGF_LE_CONTROLLER, 0x1f), "1"
 // return: status, number of packets (8)
 };
 #endif
-
-
-// BTstack commands
-const hci_cmd_t btstack_get_state = {
-OPCODE(OGF_BTSTACK, BTSTACK_GET_STATE), ""
-};
-
-/**
- * @param power_mode (0 = off, 1 = on)
- */
-const hci_cmd_t btstack_set_power_mode = {
-OPCODE(OGF_BTSTACK, BTSTACK_SET_POWER_MODE), "1"
-};
-
-
-/**
- * @param acl_capture_mode (0 = off, 1 = on)
- */
-const hci_cmd_t btstack_set_acl_capture_mode = {
-OPCODE(OGF_BTSTACK, BTSTACK_SET_ACL_CAPTURE_MODE), "1"
-};
-
-const hci_cmd_t btstack_get_version = {
-OPCODE(OGF_BTSTACK, BTSTACK_GET_VERSION), ""
-};
-
-const hci_cmd_t btstack_get_system_bluetooth_enabled = {
-OPCODE(OGF_BTSTACK, BTSTACK_GET_SYSTEM_BLUETOOTH_ENABLED), ""
-};
-
-/**
- * @param bluetooth_enabled_flag (0 = off, 1 = on, only used by btstack config)
- */
-const hci_cmd_t btstack_set_system_bluetooth_enabled = {
-OPCODE(OGF_BTSTACK, BTSTACK_SET_SYSTEM_BLUETOOTH_ENABLED), "1"
-};
-
-/**
- * @param discoverable_flag (0 = off, 1 = on)
- */
-const hci_cmd_t btstack_set_discoverable = {
-OPCODE(OGF_BTSTACK, BTSTACK_SET_DISCOVERABLE), "1"
-};
-
-/**
- * @param bluetooth_enabled_flag (0 = off, 1 = on, only used by btstack config)
- */
-const hci_cmd_t btstack_set_bluetooth_enabled = {
-OPCODE(OGF_BTSTACK, BTSTACK_SET_BLUETOOTH_ENABLED), "1"
-};
-
-/**
- * @param bd_addr (48)
- * @param psm (16)
- */
-const hci_cmd_t l2cap_create_channel_cmd = {
-OPCODE(OGF_BTSTACK, L2CAP_CREATE_CHANNEL), "B2"
-};
-
-/**
- * @param bd_addr (48)
- * @param psm (16)
- * @param mtu (16)
- */
-const hci_cmd_t l2cap_create_channel_mtu_cmd = {
-OPCODE(OGF_BTSTACK, L2CAP_CREATE_CHANNEL_MTU), "B22"
-// @param bd_addr(48), psm (16), mtu (16)
-};
-
-/**
- * @param channel (16)
- * @param reason (16)
- */
-const hci_cmd_t l2cap_disconnect_cmd = {
-OPCODE(OGF_BTSTACK, L2CAP_DISCONNECT), "21"
-};
-
-/**
- * @param psm (16)
- * @param mtu (16)
- */
-const hci_cmd_t l2cap_register_service_cmd = {
-OPCODE(OGF_BTSTACK, L2CAP_REGISTER_SERVICE), "22"
-};
-
-/**
- * @param psm (16)
- */
-const hci_cmd_t l2cap_unregister_service_cmd = {
-OPCODE(OGF_BTSTACK, L2CAP_UNREGISTER_SERVICE), "2"
-};
-
-/**
- * @param source_cid (16)
- */
-const hci_cmd_t l2cap_accept_connection_cmd = {
-OPCODE(OGF_BTSTACK, L2CAP_ACCEPT_CONNECTION), "2"
-};
-
-/**
- * @param source_cid (16)
- * @param reason
- */
-const hci_cmd_t l2cap_decline_connection_cmd = {
-OPCODE(OGF_BTSTACK, L2CAP_DECLINE_CONNECTION), "21"
-};
-
-
-/**
- * @param service_record
- */
-const hci_cmd_t sdp_register_service_record_cmd = {
-OPCODE(OGF_BTSTACK, SDP_REGISTER_SERVICE_RECORD), "S"
-};
-
-/**
- * @param service_record_handle
- */
-const hci_cmd_t sdp_unregister_service_record_cmd = {
-OPCODE(OGF_BTSTACK, SDP_UNREGISTER_SERVICE_RECORD), "4"
-};
-
-/**
- * @param bd_addr
- * @param service_search_pattern
- */
-const hci_cmd_t sdp_client_query_rfcomm_services_cmd = {
-OPCODE(OGF_BTSTACK, SDP_CLIENT_QUERY_RFCOMM_SERVICES), "BS"
-};
-
-/**
- * @param bd_addr
- * @param service_search_pattern
- * @param attribute_ID_list
- */
-const hci_cmd_t sdp_client_query_services_cmd = {
-OPCODE(OGF_BTSTACK, SDP_CLIENT_QUERY_SERVICES), "BSS"
-};
-
-/**
- * @param bd_addr
- * @param server_channel
- */
-const hci_cmd_t rfcomm_create_channel_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_CREATE_CHANNEL), "B1"
-};
-
-/**
- * @param bd_addr
- * @param server_channel
- * @param mtu
- * @param credits
- */
-const hci_cmd_t rfcomm_create_channel_with_initial_credits_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_CREATE_CHANNEL_WITH_CREDITS), "B121"
-};
-
-/**
- * @param rfcomm_cid
- * @param credits
- */
-const hci_cmd_t rfcomm_grants_credits_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_GRANT_CREDITS), "21"
-};
-
-/**
- * @param rfcomm_cid
- * @param reason
- */
-const hci_cmd_t rfcomm_disconnect_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_DISCONNECT), "21"
-};
-
-/**
- * @param server_channel
- * @param mtu
- */
-const hci_cmd_t rfcomm_register_service_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_REGISTER_SERVICE), "12"
-};
-
-/**
- * @param server_channel
- * @param mtu
- * @param initial_credits
- */
-const hci_cmd_t rfcomm_register_service_with_initial_credits_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_REGISTER_SERVICE_WITH_CREDITS), "121"
-};
-
-/**
- * @param service_channel
- */
-const hci_cmd_t rfcomm_unregister_service_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_UNREGISTER_SERVICE), "2"
-};
-
-/**
- * @param source_cid
- */
-const hci_cmd_t rfcomm_accept_connection_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_ACCEPT_CONNECTION), "2"
-};
-
-
-/**
- * @param source_cid
- * @param reason
- */
-const hci_cmd_t rfcomm_decline_connection_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_DECLINE_CONNECTION), "21"
-};
-
-// request persistent rfcomm channel number for named service
-/**
- * @param named_service
- */
-const hci_cmd_t rfcomm_persistent_channel_for_service_cmd = {
-OPCODE(OGF_BTSTACK, RFCOMM_PERSISTENT_CHANNEL), "N"
-};
-
-/**
- * @param handle
- */
-const hci_cmd_t gap_disconnect_cmd = {
-OPCODE(OGF_BTSTACK, GAP_DISCONNECT), "H"
-};
-
-/**
- */
-const hci_cmd_t gap_le_scan_start = {
-OPCODE(OGF_BTSTACK, GAP_LE_SCAN_START), ""
-};
-
-/**
- */
-const hci_cmd_t gap_le_scan_stop = {
-OPCODE(OGF_BTSTACK, GAP_LE_SCAN_STOP), ""
-};
-
-/**
- * @param scan_type
- * @param scan_interval
- * @param scan_window
- */
-const hci_cmd_t gap_le_set_scan_parameters = {
-OPCODE(OGF_BTSTACK, GAP_LE_SET_SCAN_PARAMETERS), "122"
-};
-
-/**
- * @param peer_address_type
- * @param peer_address
- */
-const hci_cmd_t gap_le_connect_cmd = {
-OPCODE(OGF_BTSTACK, GAP_LE_CONNECT), "1B"
-};
-
-/**
- * @param peer_address_type
- * @param peer_address
- */
-const hci_cmd_t gap_le_connect_cancel_cmd = {
-OPCODE(OGF_BTSTACK, GAP_LE_CONNECT_CANCEL), ""
-};
-
-/**
- * @param handle
- */
-const hci_cmd_t gatt_discover_primary_services_cmd = {
-OPCODE(OGF_BTSTACK, GATT_DISCOVER_ALL_PRIMARY_SERVICES), "H"
-};
-
-/**
- * @param handle
- * @param uuid16
- */
-const hci_cmd_t gatt_discover_primary_services_by_uuid16_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_DISCOVER_PRIMARY_SERVICES_BY_UUID16), "H2"
-};
-
-/**
- * @param handle
- * @param uuid128
- */
-const hci_cmd_t gatt_discover_primary_services_by_uuid128_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_DISCOVER_PRIMARY_SERVICES_BY_UUID128), "HU"
-};
-
-/**
- * @param handle
- * @param service
- */
-const hci_cmd_t gatt_find_included_services_for_service_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_FIND_INCLUDED_SERVICES_FOR_SERVICE), "HX"
-};
-
-/**
- * @param handle
- * @param service
- */
-const hci_cmd_t gatt_discover_characteristics_for_service_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTICS_FOR_SERVICE), "HX"
-};
-
-/**
- * @param handle
- * @param service
- * @param uuid128
- */
-const hci_cmd_t gatt_discover_characteristics_for_service_by_uuid128_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTICS_FOR_SERVICE_BY_UUID128), "HXU"
-};
-
-/**
- * @param handle
- * @param characteristic
- */
-const hci_cmd_t gatt_discover_characteristic_descriptors_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTIC_DESCRIPTORS), "HY"
-};
-
-/**
- * @param handle
- * @param characteristic
- */
-const hci_cmd_t gatt_read_value_of_characteristic_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_READ_VALUE_OF_CHARACTERISTIC), "HY"
-};
-
-/**
- * @param handle
- * @param characteristic
- */
-const hci_cmd_t gatt_read_long_value_of_characteristic_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_READ_LONG_VALUE_OF_CHARACTERISTIC), "HY"
-};
-
-/**
- * @param handle
- * @param characteristic
- * @param data_length
- * @param data
- */
-const hci_cmd_t gatt_write_value_of_characteristic_without_response_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_WRITE_VALUE_OF_CHARACTERISTIC_WITHOUT_RESPONSE), "HYLV"
-};
-
-/**
- * @param handle
- * @param characteristic
- * @param data_length
- * @param data
- */
-const hci_cmd_t gatt_write_value_of_characteristic_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_WRITE_VALUE_OF_CHARACTERISTIC), "HYLV"
-};
-
-/**
- * @param handle
- * @param characteristic
- * @param data_length
- * @param data
- */
-const hci_cmd_t gatt_write_long_value_of_characteristic_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_WRITE_LONG_VALUE_OF_CHARACTERISTIC), "HYLV"
-};
-
-/**
- * @param handle
- * @param characteristic
- * @param data_length
- * @param data
- */
-const hci_cmd_t gatt_reliable_write_long_value_of_characteristic_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_RELIABLE_WRITE_LONG_VALUE_OF_CHARACTERISTIC), "HYLV"
-};
-
-/**
- * @param handle
- * @param descriptor
- */
-const hci_cmd_t gatt_read_characteristic_descriptor_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_READ_CHARACTERISTIC_DESCRIPTOR), "HZ"
-};
-
-/**
- * @param handle
- * @param descriptor
- */
-const hci_cmd_t gatt_read_long_characteristic_descriptor_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_READ_LONG_CHARACTERISTIC_DESCRIPTOR), "HZ"
-};
-
-/**
- * @param handle
- * @param descriptor
- * @param data_length
- * @param data
- */
-const hci_cmd_t gatt_write_characteristic_descriptor_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_WRITE_CHARACTERISTIC_DESCRIPTOR), "HZLV"
-};
-
-/**
- * @param handle
- * @param descriptor
- * @param data_length
- * @param data
- */
-const hci_cmd_t gatt_write_long_characteristic_descriptor_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_WRITE_LONG_CHARACTERISTIC_DESCRIPTOR), "HZLV"
-};
-
-/**
- * @param handle
- * @param characteristic
- * @param configuration
- */
-const hci_cmd_t gatt_write_client_characteristic_configuration_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_WRITE_CLIENT_CHARACTERISTIC_CONFIGURATION), "HY2"
-};
-
-/**
- * @param handle
- */
-const hci_cmd_t gatt_get_mtu = {
-    OPCODE(OGF_BTSTACK, GATT_GET_MTU), "H"
-};
diff --git a/src/hci_cmds.h b/src/hci_cmds.h
index 2b82ff363..cf05d43ad 100644
--- a/src/hci_cmds.h
+++ b/src/hci_cmds.h
@@ -96,15 +96,6 @@ typedef enum {
 
 
 // HCI Commands - see hci_cmds.c for info on parameters
-extern const hci_cmd_t btstack_get_state;
-extern const hci_cmd_t btstack_set_power_mode;
-extern const hci_cmd_t btstack_set_acl_capture_mode;
-extern const hci_cmd_t btstack_get_version;
-extern const hci_cmd_t btstack_get_system_bluetooth_enabled;
-extern const hci_cmd_t btstack_set_system_bluetooth_enabled;
-extern const hci_cmd_t btstack_set_discoverable;
-extern const hci_cmd_t btstack_set_bluetooth_enabled;    // only used by btstack config
-    
 extern const hci_cmd_t hci_accept_connection_request;
 extern const hci_cmd_t hci_accept_synchronous_connection;
 extern const hci_cmd_t hci_authentication_requested;
@@ -199,68 +190,6 @@ extern const hci_cmd_t hci_le_start_encryption;
 extern const hci_cmd_t hci_le_test_end;
 extern const hci_cmd_t hci_le_transmitter_test;
     
-extern const hci_cmd_t l2cap_accept_connection_cmd;
-extern const hci_cmd_t l2cap_create_channel_cmd;
-extern const hci_cmd_t l2cap_create_channel_mtu_cmd;
-extern const hci_cmd_t l2cap_decline_connection_cmd;
-extern const hci_cmd_t l2cap_disconnect_cmd;
-extern const hci_cmd_t l2cap_register_service_cmd;
-extern const hci_cmd_t l2cap_unregister_service_cmd;
-
-extern const hci_cmd_t sdp_register_service_record_cmd;
-extern const hci_cmd_t sdp_unregister_service_record_cmd;
-extern const hci_cmd_t sdp_client_query_rfcomm_services_cmd;
-extern const hci_cmd_t sdp_client_query_services_cmd;
-
-
-// accept connection @param bd_addr(48), rfcomm_cid (16)
-extern const hci_cmd_t rfcomm_accept_connection_cmd;
-// create rfcomm channel: @param bd_addr(48), channel (8)
-extern const hci_cmd_t rfcomm_create_channel_cmd;
-// create rfcomm channel: @param bd_addr(48), channel (8), mtu (16), credits (8)
-extern const hci_cmd_t rfcomm_create_channel_with_initial_credits_cmd;
-// decline rfcomm disconnect,@param bd_addr(48), rfcomm cid (16), reason(8)
-extern const hci_cmd_t rfcomm_decline_connection_cmd;
-// disconnect rfcomm disconnect, @param rfcomm_cid(8), reason(8)
-extern const hci_cmd_t rfcomm_disconnect_cmd;
-// register rfcomm service: @param channel(8), mtu (16)
-extern const hci_cmd_t rfcomm_register_service_cmd;
-// register rfcomm service: @param channel(8), mtu (16), initial credits (8)
-extern const hci_cmd_t rfcomm_register_service_with_initial_credits_cmd;
-// unregister rfcomm service, @param service_channel(16)
-extern const hci_cmd_t rfcomm_unregister_service_cmd;
-// request persisten rfcomm channel for service name: serive name (char*) 
-extern const hci_cmd_t rfcomm_persistent_channel_for_service_cmd;
-extern const hci_cmd_t rfcomm_grants_credits_cmd;
-
-extern const hci_cmd_t gap_disconnect_cmd;
-extern const hci_cmd_t gap_le_scan_start;
-extern const hci_cmd_t gap_le_scan_stop;
-extern const hci_cmd_t gap_le_set_scan_parameters;
-extern const hci_cmd_t gap_le_connect_cmd;
-extern const hci_cmd_t gap_le_connect_cancel_cmd;
-extern const hci_cmd_t gatt_discover_primary_services_cmd;
-
-extern const hci_cmd_t gatt_discover_primary_services_by_uuid16_cmd;
-extern const hci_cmd_t gatt_discover_primary_services_by_uuid128_cmd;
-extern const hci_cmd_t gatt_find_included_services_for_service_cmd;
-extern const hci_cmd_t gatt_discover_characteristics_for_service_cmd;
-extern const hci_cmd_t gatt_discover_characteristics_for_service_by_uuid128_cmd;
-extern const hci_cmd_t gatt_discover_characteristic_descriptors_cmd;
-extern const hci_cmd_t gatt_read_value_of_characteristic_cmd;
-extern const hci_cmd_t gatt_read_long_value_of_characteristic_cmd;
-extern const hci_cmd_t gatt_write_value_of_characteristic_without_response_cmd;
-extern const hci_cmd_t gatt_write_value_of_characteristic_cmd;
-extern const hci_cmd_t gatt_write_long_value_of_characteristic_cmd;
-extern const hci_cmd_t gatt_reliable_write_long_value_of_characteristic_cmd;
-extern const hci_cmd_t gatt_read_characteristic_descriptor_cmd;
-extern const hci_cmd_t gatt_read_long_characteristic_descriptor_cmd;
-extern const hci_cmd_t gatt_write_characteristic_descriptor_cmd;
-extern const hci_cmd_t gatt_write_long_characteristic_descriptor_cmd;
-extern const hci_cmd_t gatt_write_client_characteristic_configuration_cmd;
-extern const hci_cmd_t gatt_get_mtu;
-
-
 #if defined __cplusplus
 }
 #endif