diff --git a/features/lorawan/LoRaWANBase.h b/features/lorawan/LoRaWANBase.h
index 40fe483923..c122956dd6 100644
--- a/features/lorawan/LoRaWANBase.h
+++ b/features/lorawan/LoRaWANBase.h
@@ -19,7 +19,7 @@
 #ifndef LORAWAN_BASE_H_
 #define LORAWAN_BASE_H_
 
-#include "lorawan/system/lorawan_data_structures.h"
+#include "system/lorawan_data_structures.h"
 #include "events/EventQueue.h"
 
 class LoRaWANBase {
diff --git a/features/lorawan/LoRaWANInterface.cpp b/features/lorawan/LoRaWANInterface.cpp
index a47bff9865..49e400ee8c 100644
--- a/features/lorawan/LoRaWANInterface.cpp
+++ b/features/lorawan/LoRaWANInterface.cpp
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-#include "lorawan/LoRaWANInterface.h"
+#include "LoRaWANInterface.h"
 
 using namespace events;
 
diff --git a/features/lorawan/LoRaWANInterface.h b/features/lorawan/LoRaWANInterface.h
index 87fd5736d4..038d68a0dd 100644
--- a/features/lorawan/LoRaWANInterface.h
+++ b/features/lorawan/LoRaWANInterface.h
@@ -19,9 +19,9 @@
 #define LORAWANINTERFACE_H_
 
 #include "platform/Callback.h"
-#include "lorawan/LoRaWANStack.h"
-#include "lorawan/LoRaRadio.h"
-#include "lorawan/LoRaWANBase.h"
+#include "LoRaWANStack.h"
+#include "LoRaRadio.h"
+#include "LoRaWANBase.h"
 
 class LoRaWANInterface: public LoRaWANBase {
 
diff --git a/features/lorawan/LoRaWANStack.cpp b/features/lorawan/LoRaWANStack.cpp
index 42f9d6ff6d..0c6d25ca63 100644
--- a/features/lorawan/LoRaWANStack.cpp
+++ b/features/lorawan/LoRaWANStack.cpp
@@ -27,7 +27,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <stdlib.h>
 #include "platform/Callback.h"
 #include "events/EventQueue.h"
-#include "lorawan/LoRaWANStack.h"
+
+#include "LoRaWANStack.h"
 #if defined(FEATURE_COMMON_PAL)
 #include "mbed_trace.h"
 #define TRACE_GROUP "LSTK"
diff --git a/features/lorawan/LoRaWANStack.h b/features/lorawan/LoRaWANStack.h
index 20d229c727..b2846cffa9 100644
--- a/features/lorawan/LoRaWANStack.h
+++ b/features/lorawan/LoRaWANStack.h
@@ -44,9 +44,10 @@
 #include "events/EventQueue.h"
 #include "platform/Callback.h"
 #include "platform/NonCopyable.h"
-#include "lorawan/system/LoRaWANTimer.h"
+
 #include "lorastack/mac/LoRaMac.h"
-#include "lorawan/system/lorawan_data_structures.h"
+#include "system/LoRaWANTimer.h"
+#include "system/lorawan_data_structures.h"
 #include "LoRaRadio.h"
 
 class LoRaWANStack: private mbed::NonCopyable<LoRaWANStack> {
diff --git a/features/lorawan/lorastack/mac/LoRaMac.cpp b/features/lorawan/lorastack/mac/LoRaMac.cpp
index 38a039e32c..9b1874672a 100644
--- a/features/lorawan/lorastack/mac/LoRaMac.cpp
+++ b/features/lorawan/lorastack/mac/LoRaMac.cpp
@@ -22,6 +22,7 @@ Copyright (c) 2017, Arm Limited and affiliates.
 SPDX-License-Identifier: BSD-3-Clause
 */
 #include <stdlib.h>
+
 #include "LoRaMac.h"
 #include "LoRaMacCrypto.h"
 
diff --git a/features/lorawan/lorastack/mac/LoRaMac.h b/features/lorawan/lorastack/mac/LoRaMac.h
index 49e24492d9..f158af6e7f 100644
--- a/features/lorawan/lorastack/mac/LoRaMac.h
+++ b/features/lorawan/lorastack/mac/LoRaMac.h
@@ -40,13 +40,16 @@
 #ifndef MBED_LORAWAN_MAC_H__
 #define MBED_LORAWAN_MAC_H__
 
-#include "lorawan/system/LoRaWANTimer.h"
-#include "lorastack/phy/LoRaPHY.h"
-#include "lorawan/system/lorawan_data_structures.h"
-#include "LoRaMacCommand.h"
 #include "events/EventQueue.h"
+
+#include "lorastack/phy/loraphy_target.h"
+#include "lorastack/phy/LoRaPHY.h"
+
+#include "system/LoRaWANTimer.h"
+#include "system/lorawan_data_structures.h"
+
 #include "LoRaMacChannelPlan.h"
-#include "loraphy_target.h"
+#include "LoRaMacCommand.h"
 
 class LoRaMac {
 
diff --git a/features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp b/features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp
index ff75df2a4a..339aa949fd 100644
--- a/features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp
+++ b/features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp
@@ -23,7 +23,7 @@ Copyright (c) 2017, Arm Limited and affiliates.
 SPDX-License-Identifier: BSD-3-Clause
 */
 
-#include "lorastack/mac/LoRaMacChannelPlan.h"
+#include "LoRaMacChannelPlan.h"
 
 LoRaMacChannelPlan::LoRaMacChannelPlan() : _lora_phy(NULL)
 {
diff --git a/features/lorawan/lorastack/mac/LoRaMacChannelPlan.h b/features/lorawan/lorastack/mac/LoRaMacChannelPlan.h
index 7114957f6c..5060ffbfc5 100644
--- a/features/lorawan/lorastack/mac/LoRaMacChannelPlan.h
+++ b/features/lorawan/lorastack/mac/LoRaMacChannelPlan.h
@@ -28,7 +28,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #ifndef MBED_LORAWAN_LORAMACCHANNELPLAN_H_
 #define MBED_LORAWAN_LORAMACCHANNELPLAN_H_
 
-#include "lorawan/system/lorawan_data_structures.h"
+#include "system/lorawan_data_structures.h"
 #include "lorastack/phy/LoRaPHY.h"
 
 class LoRaMacChannelPlan {
diff --git a/features/lorawan/lorastack/mac/LoRaMacCommand.cpp b/features/lorawan/lorastack/mac/LoRaMacCommand.cpp
index 5b6c724a20..ce635439d0 100644
--- a/features/lorawan/lorastack/mac/LoRaMacCommand.cpp
+++ b/features/lorawan/lorastack/mac/LoRaMacCommand.cpp
@@ -21,6 +21,7 @@ Copyright (c) 2017, Arm Limited and affiliates.
 
 SPDX-License-Identifier: BSD-3-Clause
 */
+
 #include "LoRaMacCommand.h"
 #include "LoRaMac.h"
 
diff --git a/features/lorawan/lorastack/mac/LoRaMacCommand.h b/features/lorawan/lorastack/mac/LoRaMacCommand.h
index 9d4a6e4873..189b2cfa46 100644
--- a/features/lorawan/lorastack/mac/LoRaMacCommand.h
+++ b/features/lorawan/lorastack/mac/LoRaMacCommand.h
@@ -41,8 +41,8 @@
 #define __LORAMACCOMMAND_H__
 
 #include <stdint.h>
-#include "lorawan/system/lorawan_data_structures.h"
-#include "lorawan/lorastack/phy/LoRaPHY.h"
+#include "system/lorawan_data_structures.h"
+#include "lorastack/phy/LoRaPHY.h"
 
 /*!
  * Maximum MAC commands buffer size
diff --git a/features/lorawan/lorastack/mac/LoRaMacCrypto.cpp b/features/lorawan/lorastack/mac/LoRaMacCrypto.cpp
index 75deb84197..73f73fa5a0 100644
--- a/features/lorawan/lorastack/mac/LoRaMacCrypto.cpp
+++ b/features/lorawan/lorastack/mac/LoRaMacCrypto.cpp
@@ -25,12 +25,14 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include "lorastack/mac/LoRaMacCrypto.h"
-#include "lorawan/system/lorawan_data_structures.h"
 
 #include "mbedtls/aes.h"
 #include "mbedtls/cmac.h"
 
+#include "LoRaMacCrypto.h"
+#include "system/lorawan_data_structures.h"
+
+
 #if defined(MBEDTLS_CMAC_C) && defined(MBEDTLS_AES_C) && defined(MBEDTLS_CIPHER_C)
 
 /**
diff --git a/features/lorawan/lorastack/phy/LoRaPHY.cpp b/features/lorawan/lorastack/phy/LoRaPHY.cpp
index 8bbc0b5f15..6f5e15a5a4 100644
--- a/features/lorawan/lorastack/phy/LoRaPHY.cpp
+++ b/features/lorawan/lorastack/phy/LoRaPHY.cpp
@@ -26,7 +26,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <string.h>
 #include <stdint.h>
 #include <math.h>
-#include "lorawan/lorastack/phy/LoRaPHY.h"
+
+#include "LoRaPHY.h"
 
 #define BACKOFF_DC_1_HOUR       100
 #define BACKOFF_DC_10_HOURS     1000
diff --git a/features/lorawan/lorastack/phy/LoRaPHY.h b/features/lorawan/lorastack/phy/LoRaPHY.h
index 69c602bdf6..cfc80ec9b3 100644
--- a/features/lorawan/lorastack/phy/LoRaPHY.h
+++ b/features/lorawan/lorastack/phy/LoRaPHY.h
@@ -34,11 +34,12 @@
 #ifndef MBED_OS_LORAPHY_BASE_
 #define MBED_OS_LORAPHY_BASE_
 
-#include "lorawan/LoRaRadio.h"
-#include "lorawan/system/LoRaWANTimer.h"
-#include "lorawan/lorastack/phy/lora_phy_ds.h"
 #include "platform/NonCopyable.h"
 
+#include "system/LoRaWANTimer.h"
+#include "LoRaRadio.h"
+#include "lora_phy_ds.h"
+
 class LoRaPHY : private mbed::NonCopyable<LoRaPHY> {
 
 public:
diff --git a/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.h b/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.h
index 357ee326dc..ee0ee23362 100644
--- a/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.h
+++ b/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.h
@@ -34,7 +34,6 @@
 
 #include "LoRaPHY.h"
 
-
 /*!
  * LoRaMac maximum number of channels
  */
diff --git a/features/lorawan/lorastack/phy/lora_phy_ds.h b/features/lorawan/lorastack/phy/lora_phy_ds.h
index 5628bdba09..4a039ca974 100644
--- a/features/lorawan/lorastack/phy/lora_phy_ds.h
+++ b/features/lorawan/lorastack/phy/lora_phy_ds.h
@@ -31,7 +31,7 @@
 #ifndef MBED_OS_LORA_PHY_DATASTRUCTURES_
 #define MBED_OS_LORA_PHY_DATASTRUCTURES_
 
-#include "lorawan/system/lorawan_data_structures.h"
+#include "system/lorawan_data_structures.h"
 
 /*!
  * \brief Returns the minimum value between a and b.
diff --git a/features/lorawan/system/LoRaWANTimer.cpp b/features/lorawan/system/LoRaWANTimer.cpp
index 4497f75db2..df5e5abba8 100644
--- a/features/lorawan/system/LoRaWANTimer.cpp
+++ b/features/lorawan/system/LoRaWANTimer.cpp
@@ -18,7 +18,7 @@ Copyright (c) 2017, Arm Limited and affiliates.
 SPDX-License-Identifier: BSD-3-Clause
 */
 
-#include "lorawan/system/LoRaWANTimer.h"
+#include "LoRaWANTimer.h"
 
 LoRaWANTimeHandler::LoRaWANTimeHandler()
     : _queue(NULL)
diff --git a/features/lorawan/system/LoRaWANTimer.h b/features/lorawan/system/LoRaWANTimer.h
index 2b5118eb67..bfe90c234a 100644
--- a/features/lorawan/system/LoRaWANTimer.h
+++ b/features/lorawan/system/LoRaWANTimer.h
@@ -22,9 +22,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #define MBED_LORAWAN_SYS_TIMER_H__
 
 #include <stdint.h>
-#include "lorawan/system/lorawan_data_structures.h"
 #include "events/EventQueue.h"
 
+#include "lorawan_data_structures.h"
+
 class LoRaWANTimeHandler
 {
 public: