diff --git a/include/intel_de3815.h b/include/x86/intel_de3815.h
similarity index 100%
rename from include/intel_de3815.h
rename to include/x86/intel_de3815.h
diff --git a/include/intel_edison_fab_c.h b/include/x86/intel_edison_fab_c.h
similarity index 100%
rename from include/intel_edison_fab_c.h
rename to include/x86/intel_edison_fab_c.h
diff --git a/include/intel_galileo_rev_d.h b/include/x86/intel_galileo_rev_d.h
similarity index 100%
rename from include/intel_galileo_rev_d.h
rename to include/x86/intel_galileo_rev_d.h
diff --git a/include/intel_galileo_rev_g.h b/include/x86/intel_galileo_rev_g.h
similarity index 100%
rename from include/intel_galileo_rev_g.h
rename to include/x86/intel_galileo_rev_g.h
diff --git a/include/intel_minnow_max.h b/include/x86/intel_minnow_max.h
similarity index 100%
rename from include/intel_minnow_max.h
rename to include/x86/intel_minnow_max.h
diff --git a/src/x86/intel_de3815.c b/src/x86/intel_de3815.c
index 722eebe..6b3071d 100644
--- a/src/x86/intel_de3815.c
+++ b/src/x86/intel_de3815.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "common.h"
-#include "intel_de3815.h"
+#include "x86/intel_de3815.h"
 
 #define PLATFORM_NAME "Intel DE3815"
 #define MAX_SIZE 64
diff --git a/src/x86/intel_edison_fab_c.c b/src/x86/intel_edison_fab_c.c
index 5be219f..62c120d 100644
--- a/src/x86/intel_edison_fab_c.c
+++ b/src/x86/intel_edison_fab_c.c
@@ -28,7 +28,7 @@
 #include <sys/mman.h>
 
 #include "common.h"
-#include "intel_edison_fab_c.h"
+#include "x86/intel_edison_fab_c.h"
 
 #define PLATFORM_NAME "Intel Edison"
 #define SYSFS_CLASS_GPIO "/sys/class/gpio"
diff --git a/src/x86/intel_galileo_rev_d.c b/src/x86/intel_galileo_rev_d.c
index 3bf23e8..2f4fb55 100644
--- a/src/x86/intel_galileo_rev_d.c
+++ b/src/x86/intel_galileo_rev_d.c
@@ -27,7 +27,7 @@
 #include <sys/mman.h>
 
 #include "common.h"
-#include "intel_galileo_rev_d.h"
+#include "x86/intel_galileo_rev_d.h"
 
 #define UIO_PATH "/dev/uio0"
 #define PLATFORM_NAME "Intel Galileo Gen 1"
diff --git a/src/x86/intel_galileo_rev_g.c b/src/x86/intel_galileo_rev_g.c
index 4e4bd18..09d7a7f 100644
--- a/src/x86/intel_galileo_rev_g.c
+++ b/src/x86/intel_galileo_rev_g.c
@@ -28,7 +28,7 @@
 #include <sys/mman.h>
 
 #include "common.h"
-#include "intel_galileo_rev_g.h"
+#include "x86/intel_galileo_rev_g.h"
 
 #define MAX_SIZE 64
 #define SYSFS_CLASS_GPIO "/sys/class/gpio"
diff --git a/src/x86/intel_minnow_max.c b/src/x86/intel_minnow_max.c
index a6ca427..163dbfb 100644
--- a/src/x86/intel_minnow_max.c
+++ b/src/x86/intel_minnow_max.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "common.h"
-#include "intel_minnow_max.h"
+#include "x86/intel_minnow_max.h"
 
 #define PLATFORM_NAME "MinnowBoard MAX"
 #define I2C_BUS_COUNT 10
diff --git a/src/x86/x86.c b/src/x86/x86.c
index 1abbc73..88473a9 100644
--- a/src/x86/x86.c
+++ b/src/x86/x86.c
@@ -25,11 +25,11 @@
 #include <stdlib.h>
 
 #include "mraa_internal.h"
-#include "intel_galileo_rev_d.h"
-#include "intel_galileo_rev_g.h"
-#include "intel_edison_fab_c.h"
-#include "intel_de3815.h"
-#include "intel_minnow_max.h"
+#include "x86/intel_galileo_rev_d.h"
+#include "x86/intel_galileo_rev_g.h"
+#include "x86/intel_edison_fab_c.h"
+#include "x86/intel_de3815.h"
+#include "x86/intel_minnow_max.h"
 
 mraa_platform_t
 mraa_x86_platform()