diff --git a/Drivers/EM7180/Inc/em7180.h b/Drivers/EM7180/Inc/em7180.h
index 09872bd..f22b5a1 100644
--- a/Drivers/EM7180/Inc/em7180.h
+++ b/Drivers/EM7180/Inc/em7180.h
@@ -16,8 +16,8 @@
 #define EM7180_H_
 
 /* Includes */
+#include <imu_common.h>
 #include <stdint.h>
-#include "em7180_common.h"
 
 /* Definitions */
 #define EM7180_OK       (0)
diff --git a/Drivers/EM7180/Inc/em7180_common.h b/Drivers/EM7180/Inc/imu_common.h
similarity index 100%
rename from Drivers/EM7180/Inc/em7180_common.h
rename to Drivers/EM7180/Inc/imu_common.h
diff --git a/Drivers/EM7180/Inc/lis2mdl.h b/Drivers/EM7180/Inc/lis2mdl.h
index 6586c07..5907adc 100644
--- a/Drivers/EM7180/Inc/lis2mdl.h
+++ b/Drivers/EM7180/Inc/lis2mdl.h
@@ -18,6 +18,7 @@
 #define LIS2MDL_h
 
 /* Includes */
+#include <imu_common.h>
 #include <stdint.h>
 
 /* Definitions */
diff --git a/Drivers/EM7180/Inc/lps22hb.h b/Drivers/EM7180/Inc/lps22hb.h
index c65ab31..21950e8 100644
--- a/Drivers/EM7180/Inc/lps22hb.h
+++ b/Drivers/EM7180/Inc/lps22hb.h
@@ -18,6 +18,7 @@
 #define LPS22HB_h
 
 /* Includes */
+#include <imu_common.h>
 #include <stdint.h>
 
 /* Definitions */
diff --git a/Drivers/EM7180/Inc/lsm6dsm.h b/Drivers/EM7180/Inc/lsm6dsm.h
index 8983637..305431c 100644
--- a/Drivers/EM7180/Inc/lsm6dsm.h
+++ b/Drivers/EM7180/Inc/lsm6dsm.h
@@ -18,6 +18,7 @@
 #define LSM6DSM_h
 
 /* Includes */
+#include <imu_common.h>
 #include <stdint.h>
 
 /* Definitions */
diff --git a/Drivers/EM7180/Src/em7180.c b/Drivers/EM7180/Src/em7180.c
index 7000ad2..b78b17d 100644
--- a/Drivers/EM7180/Src/em7180.c
+++ b/Drivers/EM7180/Src/em7180.c
@@ -13,10 +13,10 @@
  */
 
 /* Includes */
+#include <em7180.h>
+#include <imu_common.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "em7180_common.h"
-#include "em7180.h"
 
 /* Definitions */
 /*
diff --git a/Drivers/EM7180/Src/em7180_common.c b/Drivers/EM7180/Src/imu_common.c
similarity index 96%
rename from Drivers/EM7180/Src/em7180_common.c
rename to Drivers/EM7180/Src/imu_common.c
index be1c56a..11481be 100644
--- a/Drivers/EM7180/Src/em7180_common.c
+++ b/Drivers/EM7180/Src/imu_common.c
@@ -6,8 +6,8 @@
  */
 
 /* Includes */
+#include <imu_common.h>
 #include <stdint.h>
-#include "em7180_common.h"
 
 /* Function Definitions */
 
diff --git a/Drivers/EM7180/Src/lis2mdl.c b/Drivers/EM7180/Src/lis2mdl.c
index 01aee87..5608277 100644
--- a/Drivers/EM7180/Src/lis2mdl.c
+++ b/Drivers/EM7180/Src/lis2mdl.c
@@ -15,10 +15,9 @@
  */
 
 /* Includes */
-#include <stdint.h>
+#include <imu_common.h>
+#include <lis2mdl.h>
 #include <stddef.h>
-#include "em7180_common.h"
-#include "lis2mdl.h"
 
 /* Definitions */
 /*
diff --git a/Drivers/EM7180/Src/lps22hb.c b/Drivers/EM7180/Src/lps22hb.c
index c294953..d1aeece 100644
--- a/Drivers/EM7180/Src/lps22hb.c
+++ b/Drivers/EM7180/Src/lps22hb.c
@@ -15,10 +15,9 @@
  */
 
 /* Includes */
-#include <stdint.h>
+#include <imu_common.h>
+#include <lps22hb.h>
 #include <stddef.h>
-#include "em7180_common.h"
-#include "lps22hb.h"
 
 /* Definitions */
 /*
diff --git a/Drivers/EM7180/Src/lsm6dsm.c b/Drivers/EM7180/Src/lsm6dsm.c
index 3729c8b..1a196d3 100644
--- a/Drivers/EM7180/Src/lsm6dsm.c
+++ b/Drivers/EM7180/Src/lsm6dsm.c
@@ -15,10 +15,9 @@
  */
 
 /* Includes */
-#include <stdint.h>
+#include <imu_common.h>
+#include <lsm6dsm.h>
 #include <stddef.h>
-#include "em7180_common.h"
-#include "lsm6dsm.h"
 
 /* Definitions */
 /*