diff --git a/configure.in b/configure.in
index 4382f33a5..13f1d940d 100644
--- a/configure.in
+++ b/configure.in
@@ -102,6 +102,7 @@ if test "x$target" = xiphone; then
     REMOTE_DEVICE_DB="remote_device_db_iphone"
     USE_COCOA_RUN_LOOP="yes"
     HAVE_SO_NOSIGPIPE="yes";
+    PLATFORM_SOURCES="bt_control_iphone.m platform_iphone.m"
 
     case "$host_os" in
         darwin*)
@@ -177,10 +178,7 @@ if test "x$target" = xiphone; then
         USE_LDID="#"
         echo "USE_LDID:        no"
     fi
-    
-    REMOTE_DEVICE_DB_SOURCES="remote_device_db_iphone.m"
-    REMOTE_DEVICE_DB="remote_device_db_iphone"
-    
+        
 else
     case "$host_os" in
         darwin*)
@@ -212,6 +210,7 @@ else
     echo "UART_SPEED:          $UART_SPEED"
 fi
 
+echo "PLATFORM_SOURCES:    $PLATFORM_SOURCES"
 echo "USE_LAUNCHD:         $USE_LAUNCHD"
 echo "USE_SPRINGBOARD:     $USE_SPRINGBOARD"
 echo "USE_PREFSBUNDLE:     $USE_PREFSBUNDLE"
@@ -261,6 +260,7 @@ AC_SUBST(HAVE_LIBUSB)
 AC_SUBST(USE_LDID)
 AC_SUBST(REMOTE_DEVICE_DB_SOURCES)
 AC_SUBST(USB_SOURCES)
+AC_SUBST(PLATFORM_SOURCES)
 AC_SUBST(SPRINGBOARD_ACCESS_SOURCES)
 AC_SUBST(RUN_LOOP_SOURCES)
 AC_SUBST(BTSTACK_LIB_LDFLAGS)
diff --git a/src/Makefile.in b/src/Makefile.in
index bb910e61e..b060f54cf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -10,11 +10,12 @@ remote_device_db_sources = @REMOTE_DEVICE_DB_SOURCES@
 run_loop_sources = @RUN_LOOP_SOURCES@
 springboard_access_sources = @SPRINGBOARD_ACCESS_SOURCES@
 usb_sources = @USB_SOURCES@
+platform_sources = @PLATFORM_SOURCES@
 
 libBTstack_SOURCES = btstack.c hci_cmds.c linked_list.c run_loop.c $(run_loop_sources) sdp_util.c socket_connection.c utils.c
 			  
 BTdaemon_SOURCES =  $(libBTstack_SOURCES) \
-    bt_control_iphone.m     \
+	$(platform_sources)     \
     daemon.c                \
     hci.c                   \
     hci_dump.c              \
@@ -23,7 +24,6 @@ BTdaemon_SOURCES =  $(libBTstack_SOURCES) \
     l2cap.c                 \
     l2cap_signaling.c       \
     $(remote_device_db_sources)  \
-    platform_iphone.m       \
     rfcomm.c                \
     sdp.c                   \
     $(springboard_access_sources)