diff --git a/subsys/bluetooth/controller/ll_sw/Makefile b/subsys/bluetooth/controller/ll_sw/Makefile
index 5db1bc5d74c..c60465a75cc 100644
--- a/subsys/bluetooth/controller/ll_sw/Makefile
+++ b/subsys/bluetooth/controller/ll_sw/Makefile
@@ -1,6 +1,4 @@
-ccflags-$(CONFIG_BLUETOOTH_LL_SW) += -I$(srctree)/subsys/bluetooth/controller/util
-ccflags-$(CONFIG_BLUETOOTH_LL_SW) += -I$(srctree)/subsys/bluetooth/controller/hal
-ccflags-$(CONFIG_BLUETOOTH_LL_SW) += -I$(srctree)/subsys/bluetooth/controller/ticker
 ccflags-$(CONFIG_BLUETOOTH_LL_SW) += -I$(srctree)/subsys/bluetooth/controller/include
+ccflags-$(CONFIG_BLUETOOTH_LL_SW) += -I$(srctree)/subsys/bluetooth/controller
 obj-$(CONFIG_BLUETOOTH_LL_SW) += ctrl.o
 obj-$(CONFIG_BLUETOOTH_LL_SW) += ll.o
diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c
index e5f7cc042f9..1c0868c7068 100644
--- a/subsys/bluetooth/controller/ll_sw/ctrl.c
+++ b/subsys/bluetooth/controller/ll_sw/ctrl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nordic Semiconductor ASA
+ * Copyright (c) 2016-2017 Nordic Semiconductor ASA
  * Copyright (c) 2016 Vinayak Kariappa Chettimada
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -15,27 +15,27 @@
 #include <bluetooth/hci.h>
 #include <misc/util.h>
 
-#include "cpu.h"
-#include "rand.h"
-#include "ecb.h"
-#include "ccm.h"
-#include "radio.h"
+#include "hal/cpu.h"
+#include "hal/rand.h"
+#include "hal/ecb.h"
+#include "hal/ccm.h"
+#include "hal/radio.h"
+#include "hal/debug.h"
 
-#include "mem.h"
-#include "memq.h"
-#include "mayfly.h"
-#include "util.h"
-#include "ticker.h"
+#include "util/config.h"
+#include "util/util.h"
+#include "util/mem.h"
+#include "util/memq.h"
+#include "util/mayfly.h"
+
+#include "ticker/ticker.h"
 
 #include "pdu.h"
 #include "ctrl.h"
 #include "ctrl_internal.h"
 
-#include "config.h"
-
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER)
 #include <bluetooth/log.h>
-#include "debug.h"
 
 #define RADIO_PREAMBLE_TO_ADDRESS_US	40
 #define RADIO_HCTO_US			(150 + 2 + 2 + \
diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c
index 1fed5ffe25e..9deacc891b0 100644
--- a/subsys/bluetooth/controller/ll_sw/ll.c
+++ b/subsys/bluetooth/controller/ll_sw/ll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nordic Semiconductor ASA
+ * Copyright (c) 2016-2017 Nordic Semiconductor ASA
  * Copyright (c) 2016 Vinayak Kariappa Chettimada
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -18,26 +18,25 @@
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER)
 #include <bluetooth/log.h>
 
-#include "ccm.h"
-#include "radio.h"
+#include "hal/cpu.h"
+#include "hal/cntr.h"
+#include "hal/rand.h"
+#include "hal/ccm.h"
+#include "hal/radio.h"
+#include "hal/debug.h"
+
+#include "util/config.h"
+#include "util/util.h"
+#include "util/mem.h"
+#include "util/mayfly.h"
+
+#include "ticker/ticker.h"
 
-#include "mem.h"
-#include "util.h"
-#include "ticker.h"
-#include "config.h"
-#include "mayfly.h"
-#include "mem.h"
-#include "rand.h"
-#include "radio.h"
-#include "cntr.h"
-#include "cpu.h"
 #include "pdu.h"
 #include "ctrl.h"
 #include "ctrl_internal.h"
 #include "ll.h"
 
-#include "debug.h"
-
 /* Global singletons */
 static uint8_t MALIGN(4) _rand_context[3 + 4 + 1];
 static uint8_t MALIGN(4) _ticker_nodes[RADIO_TICKER_NODES][TICKER_NODE_T_SIZE];