diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile
index ddf448e98..8699c015a 100644
--- a/port/msp430f5229lp-cc2564b/Makefile
+++ b/port/msp430f5229lp-cc2564b/Makefile
@@ -64,6 +64,7 @@ SPP = \
     l2cap_signaling.c         \
 	rfcomm.c			      \
     sdp_util.c                \
+    spp_server.c              \
 
 SDP_CLIENT += \
     sdp_client.o		      \
diff --git a/port/msp430f5229lp-cc2564b/src/main.c b/port/msp430f5229lp-cc2564b/src/main.c
index d13a6bc78..de46e7722 100644
--- a/port/msp430f5229lp-cc2564b/src/main.c
+++ b/port/msp430f5229lp-cc2564b/src/main.c
@@ -49,19 +49,18 @@
 #include <msp430.h>
 
 #include "btstack_chipset_cc256x.h"
+#include "btstack_config.h"
+#include "btstack_memory.h"
+#include "btstack_run_loop.h"
+#include "btstack_run_loop_embedded.h"
+#include "classic/btstack_link_key_db.h"
 #include "hal_board.h"
 #include "hal_compat.h"
-#include "hal_usb.h"
-
-#include "btstack_run_loop.h"
-#include "hal_tick.h"
 #include "hal_cpu.h"
-
+#include "hal_tick.h"
+#include "hal_usb.h"
 #include "hci.h"
 #include "hci_dump.h"
-#include "btstack_memory.h"
-#include "classic/btstack_link_key_db.h"
-#include "btstack_config.h"
 
 static void hw_setup(void){