diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.h b/src/lib/ecl/attitude_fw/ecl_roll_controller.h
index dbcabd8478..0799dbe03b 100644
--- a/src/lib/ecl/attitude_fw/ecl_roll_controller.h
+++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.h
@@ -53,7 +53,6 @@
 #include <stdint.h>
 #include <systemlib/perf_counter.h>
 
-
 class __EXPORT ECL_RollController //XXX: create controller superclass
 {
 public:
diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.h b/src/lib/ecl/attitude_fw/ecl_yaw_controller.h
index c9e80930f3..a360c14b89 100644
--- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.h
+++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.h
@@ -52,7 +52,6 @@
 #include <stdint.h>
 #include <systemlib/perf_counter.h>
 
-
 class __EXPORT ECL_YawController //XXX: create controller superclass
 {
 public:
diff --git a/src/lib/ecl/ecl.h b/src/lib/ecl/ecl.h
index 662e3a39f5..aa3c5000a4 100644
--- a/src/lib/ecl/ecl.h
+++ b/src/lib/ecl/ecl.h
@@ -38,6 +38,6 @@
  */
 
 #include <drivers/drv_hrt.h>
+
 #define ecl_absolute_time hrt_absolute_time
 #define ecl_elapsed_time hrt_elapsed_time
-
diff --git a/src/lib/geo/geo.h b/src/lib/geo/geo.h
index ff2d92389f..fd754a1ae6 100644
--- a/src/lib/geo/geo.h
+++ b/src/lib/geo/geo.h
@@ -45,12 +45,12 @@
 
 #pragma once
 
-#ifdef CONFIG_ARCH_ARM
+
 #include "uORB/topics/fence.h"
 #include "uORB/topics/vehicle_global_position.h"
 
 __BEGIN_DECLS
-#endif
+
 #include "geo_lookup/geo_mag_declination.h"
 
 #include <stdbool.h>
@@ -278,6 +278,6 @@ __EXPORT float _wrap_360(float bearing);
 __EXPORT float _wrap_pi(float bearing);
 __EXPORT float _wrap_2pi(float bearing);
 
-#ifdef CONFIG_ARCH_ARM
+
 __END_DECLS
-#endif
+