diff --git a/platform/daemon/src/btstack_server.h b/platform/daemon/src/btstack_server.h
new file mode 100644
index 000000000..a13b49999
--- /dev/null
+++ b/platform/daemon/src/btstack_server.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 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
+ *
+ */
+
+
+/*
+ *  btstack_server.h
+ *
+ *  BTstack server for use either standalone or inside an application process
+ *
+ */
+
+#ifndef __BTSTACK_SERVER_H
+#define __BTSTACK_SERVER_H
+
+/** 
+ * @brief Start BTstack Server either with TCP or Unix Domain Socket
+ * @param tcp_flag 1=start TCP Server, 0=start Unix Socket Server
+ * @returns 0 on success
+ */
+int btstack_server_run(int tcp_flag);
+
+/** 
+ * @brief Start BTstack Server with TCP Socket
+ * @param tcp_flag 1=start TCP Server, 0=start Unix Socket Server
+ * @returns 0 on success
+ */
+int btstack_server_run_tcp(void);
+
+#endif
diff --git a/platform/daemon/src/daemon.c b/platform/daemon/src/daemon.c
index ab12a44c8..355bd2c50 100644
--- a/platform/daemon/src/daemon.c
+++ b/platform/daemon/src/daemon.c
@@ -68,6 +68,7 @@
 #include "btstack_event.h"
 #include "btstack_linked_list.h"
 #include "btstack_run_loop.h"
+#include "btstack_server.h"
 
 #ifdef _WIN32
 #include "btstack_run_loop_windows.h"
@@ -1927,7 +1928,7 @@ static void handle_gatt_client_event(uint8_t packet_type, uint16_t channel, uint
 
 static char hostname[30];
 
-static int btstack_server_run(int tcp_flag){
+int btstack_server_run(int tcp_flag){
 
     if (tcp_flag){
         printf("BTstack Daemon started on port %u\n", BTSTACK_PORT);
@@ -2101,6 +2102,8 @@ static int btstack_server_run(int tcp_flag){
     return 0;
 }
 
+
+
 int main (int argc,  char * const * argv){
     
     int tcp_flag = 0;