diff --git a/debugcc.c b/debugcc.c
index e2220cc..6946071 100644
--- a/debugcc.c
+++ b/debugcc.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static unsigned int measure_ticks(struct gcc_mux *gcc, unsigned int ticks)
 {
diff --git a/meson.build b/meson.build
index 5ef4838..8a6a279 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,7 @@ platform_defs = []
 platform_array = []
 
 foreach p: platforms
-  debugcc_srcs += p + '.c'
+  debugcc_srcs += 'platforms/' + p + '.c'
   platform_defs += 'extern struct debugcc_platform ' + p + '_debugcc;'
   platform_array += '\t&' + p + '_debugcc,'
 
@@ -70,4 +70,5 @@ endif
 executable('debugcc',
   debugcc_srcs,
   link_args: debugcc_link_args,
+  include_directories : include_directories('.'),
   install: true)
diff --git a/hamoa.c b/platforms/hamoa.c
similarity index 99%
rename from hamoa.c
rename to platforms/hamoa.c
index cbd327b..e4d5a08 100644
--- a/hamoa.c
+++ b/platforms/hamoa.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/ipq8064.c b/platforms/ipq8064.c
similarity index 99%
rename from ipq8064.c
rename to platforms/ipq8064.c
index ffbc723..e9c8a0c 100644
--- a/ipq8064.c
+++ b/platforms/ipq8064.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 #define GCC_PHYS		0x900000
 
diff --git a/milos.c b/platforms/milos.c
similarity index 99%
rename from milos.c
rename to platforms/milos.c
index 1678770..04c3d85 100644
--- a/milos.c
+++ b/platforms/milos.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/msm8936.c b/platforms/msm8936.c
similarity index 99%
rename from msm8936.c
rename to platforms/msm8936.c
index ab84b8b..8035667 100644
--- a/msm8936.c
+++ b/platforms/msm8936.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 #define GCC_BASE			0x01800000
 #define GCC_SIZE			0x80000
diff --git a/msm8974.c b/platforms/msm8974.c
similarity index 99%
rename from msm8974.c
rename to platforms/msm8974.c
index eb78e82..0aa4e60 100644
--- a/msm8974.c
+++ b/platforms/msm8974.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/msm8994.c b/platforms/msm8994.c
similarity index 99%
rename from msm8994.c
rename to platforms/msm8994.c
index 7d9e42d..59435a0 100644
--- a/msm8994.c
+++ b/platforms/msm8994.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/msm8996.c b/platforms/msm8996.c
similarity index 99%
rename from msm8996.c
rename to platforms/msm8996.c
index aefe36b..385b452 100644
--- a/msm8996.c
+++ b/platforms/msm8996.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 #define GCC_BASE			0x300000
 #define GCC_SIZE			0x8f014
diff --git a/msm8998.c b/platforms/msm8998.c
similarity index 99%
rename from msm8998.c
rename to platforms/msm8998.c
index 1a0940d..129732a 100644
--- a/msm8998.c
+++ b/platforms/msm8998.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/qcm2290.c b/platforms/qcm2290.c
similarity index 99%
rename from qcm2290.c
rename to platforms/qcm2290.c
index cd2f220..5f403b6 100644
--- a/qcm2290.c
+++ b/platforms/qcm2290.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/qcs404.c b/platforms/qcs404.c
similarity index 99%
rename from qcs404.c
rename to platforms/qcs404.c
index adf6567..eeeb5a5 100644
--- a/qcs404.c
+++ b/platforms/qcs404.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 #define GCC_BASE	0x01800000
 #define GCC_SIZE	0x80000
diff --git a/sc7180.c b/platforms/sc7180.c
similarity index 99%
rename from sc7180.c
rename to platforms/sc7180.c
index 4213731..8276f03 100644
--- a/sc7180.c
+++ b/platforms/sc7180.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sc8280xp.c b/platforms/sc8280xp.c
similarity index 99%
rename from sc8280xp.c
rename to platforms/sc8280xp.c
index a6c2d1e..fac434d 100644
--- a/sc8280xp.c
+++ b/platforms/sc8280xp.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sdm845.c b/platforms/sdm845.c
similarity index 99%
rename from sdm845.c
rename to platforms/sdm845.c
index 6e282e0..b2e081f 100644
--- a/sdm845.c
+++ b/platforms/sdm845.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 #define GCC_BASE	0x100000
 #define GCC_SIZE	0x1f0000
diff --git a/sm6115.c b/platforms/sm6115.c
similarity index 99%
rename from sm6115.c
rename to platforms/sm6115.c
index 0e75951..e8d23ed 100644
--- a/sm6115.c
+++ b/platforms/sm6115.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sm6125.c b/platforms/sm6125.c
similarity index 99%
rename from sm6125.c
rename to platforms/sm6125.c
index 18d215b..e723760 100644
--- a/sm6125.c
+++ b/platforms/sm6125.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sm6350.c b/platforms/sm6350.c
similarity index 99%
rename from sm6350.c
rename to platforms/sm6350.c
index 352769b..d46be5d 100644
--- a/sm6350.c
+++ b/platforms/sm6350.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sm6375.c b/platforms/sm6375.c
similarity index 99%
rename from sm6375.c
rename to platforms/sm6375.c
index c1af761..d98f624 100644
--- a/sm6375.c
+++ b/platforms/sm6375.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sm8150.c b/platforms/sm8150.c
similarity index 99%
rename from sm8150.c
rename to platforms/sm8150.c
index 07c9270..67c488c 100644
--- a/sm8150.c
+++ b/platforms/sm8150.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sm8250.c b/platforms/sm8250.c
similarity index 99%
rename from sm8250.c
rename to platforms/sm8250.c
index 01f91c2..be79995 100644
--- a/sm8250.c
+++ b/platforms/sm8250.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sm8350.c b/platforms/sm8350.c
similarity index 99%
rename from sm8350.c
rename to platforms/sm8350.c
index e6519f7..463564d 100644
--- a/sm8350.c
+++ b/platforms/sm8350.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {
diff --git a/sm8450.c b/platforms/sm8450.c
similarity index 99%
rename from sm8450.c
rename to platforms/sm8450.c
index 9b6b95e..2a67e4b 100644
--- a/sm8450.c
+++ b/platforms/sm8450.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 /* Enabling APSS can cause Bus error issues, so do not enable them by default */
 #define ENABLE_SM8450_APSS_CLOCKS 0
diff --git a/sm8550.c b/platforms/sm8550.c
similarity index 99%
rename from sm8550.c
rename to platforms/sm8550.c
index 7c14c34..ae81cd7 100644
--- a/sm8550.c
+++ b/platforms/sm8550.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 /* Enabling APSS can cause Bus error issues, so do not enable them by default */
 #define ENABLE_SM8550_APSS_CLOCKS 0
diff --git a/sm8650.c b/platforms/sm8650.c
similarity index 99%
rename from sm8650.c
rename to platforms/sm8650.c
index aa0da7e..375d985 100644
--- a/sm8650.c
+++ b/platforms/sm8650.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugcc.h"
+#include <debugcc.h>
 
 static struct gcc_mux gcc = {
 	.mux = {