diff --git a/src/modules/uORB/topics/actuator_controls.h b/src/modules/uORB/topics/actuator_controls.h
index e768ab2f61..6c641dbcec 100644
--- a/src/modules/uORB/topics/actuator_controls.h
+++ b/src/modules/uORB/topics/actuator_controls.h
@@ -47,7 +47,9 @@
 #define TOPIC_ACTUATOR_CONTROLS_H
 
 #include <stdint.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 
 #define NUM_ACTUATOR_CONTROLS		8
 #define NUM_ACTUATOR_CONTROL_GROUPS	4	/**< for sanity checking */
@@ -70,9 +72,11 @@ struct actuator_controls_s {
  */
 
 /* actuator control sets; this list can be expanded as more controllers emerge */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(actuator_controls_0);
 ORB_DECLARE(actuator_controls_1);
 ORB_DECLARE(actuator_controls_2);
 ORB_DECLARE(actuator_controls_3);
+#endif
 
 #endif
diff --git a/src/modules/uORB/topics/airspeed.h b/src/modules/uORB/topics/airspeed.h
index d2ee754cdf..4c115a8113 100644
--- a/src/modules/uORB/topics/airspeed.h
+++ b/src/modules/uORB/topics/airspeed.h
@@ -40,7 +40,9 @@
 #ifndef TOPIC_AIRSPEED_H_
 #define TOPIC_AIRSPEED_H_
 
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 #include <stdint.h>
 
 /**
@@ -63,6 +65,8 @@ struct airspeed_s {
  */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(airspeed);
+#endif
 
 #endif
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h
index dde237adc3..af5df69792 100644
--- a/src/modules/uORB/topics/manual_control_setpoint.h
+++ b/src/modules/uORB/topics/manual_control_setpoint.h
@@ -41,8 +41,9 @@
 #define TOPIC_MANUAL_CONTROL_SETPOINT_H_
 
 #include <stdint.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
-
+#endif
 /**
  * Switch position
  */
@@ -106,6 +107,7 @@ struct manual_control_setpoint_s {
  */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(manual_control_setpoint);
-
+#endif
 #endif
diff --git a/src/modules/uORB/topics/parameter_update.h b/src/modules/uORB/topics/parameter_update.h
index 68964deb0a..7afb78d49d 100644
--- a/src/modules/uORB/topics/parameter_update.h
+++ b/src/modules/uORB/topics/parameter_update.h
@@ -40,7 +40,9 @@
 #define TOPIC_PARAMETER_UPDATE_H
 
 #include <stdint.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 
 /**
  * @addtogroup topics
@@ -56,6 +58,8 @@ struct parameter_update_s {
  * @}
  */
 
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(parameter_update);
+#endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/modules/uORB/topics/vehicle_attitude.h b/src/modules/uORB/topics/vehicle_attitude.h
index 40328af146..7780988c84 100755
--- a/src/modules/uORB/topics/vehicle_attitude.h
+++ b/src/modules/uORB/topics/vehicle_attitude.h
@@ -44,7 +44,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 
 /**
  * @addtogroup topics
@@ -87,6 +89,8 @@ struct vehicle_attitude_s {
  */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(vehicle_attitude);
+#endif
 
 #endif
diff --git a/src/modules/uORB/topics/vehicle_attitude_setpoint.h b/src/modules/uORB/topics/vehicle_attitude_setpoint.h
index 8446e9c6e2..8b5a761433 100644
--- a/src/modules/uORB/topics/vehicle_attitude_setpoint.h
+++ b/src/modules/uORB/topics/vehicle_attitude_setpoint.h
@@ -42,7 +42,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 
 /**
  * @addtogroup topics
@@ -82,6 +84,8 @@ struct vehicle_attitude_setpoint_s {
  */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(vehicle_attitude_setpoint);
+#endif
 
 #endif /* TOPIC_ARDRONE_CONTROL_H_ */
diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h
index 49e2ba4b56..b071e0fa3e 100644
--- a/src/modules/uORB/topics/vehicle_control_mode.h
+++ b/src/modules/uORB/topics/vehicle_control_mode.h
@@ -48,7 +48,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 #include "vehicle_status.h"
 
 /**
@@ -89,6 +91,8 @@ struct vehicle_control_mode_s {
  */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(vehicle_control_mode);
+#endif
 
 #endif
diff --git a/src/modules/uORB/topics/vehicle_global_position.h b/src/modules/uORB/topics/vehicle_global_position.h
index c3bb3b8936..e8f010924d 100644
--- a/src/modules/uORB/topics/vehicle_global_position.h
+++ b/src/modules/uORB/topics/vehicle_global_position.h
@@ -45,7 +45,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 
 /**
  * @addtogroup topics
@@ -81,6 +83,7 @@ struct vehicle_global_position_s {
  */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(vehicle_global_position);
-
+#endif
 #endif
diff --git a/src/modules/uORB/topics/vehicle_rates_setpoint.h b/src/modules/uORB/topics/vehicle_rates_setpoint.h
index 9f8b412a7d..cbfab89d60 100644
--- a/src/modules/uORB/topics/vehicle_rates_setpoint.h
+++ b/src/modules/uORB/topics/vehicle_rates_setpoint.h
@@ -41,7 +41,9 @@
 #define TOPIC_VEHICLE_RATES_SETPOINT_H_
 
 #include <stdint.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 
 /**
  * @addtogroup topics
@@ -62,6 +64,8 @@ struct vehicle_rates_setpoint_s {
 */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(vehicle_rates_setpoint);
+#endif
 
 #endif
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h
index b683bf98ad..973987f5c3 100644
--- a/src/modules/uORB/topics/vehicle_status.h
+++ b/src/modules/uORB/topics/vehicle_status.h
@@ -53,7 +53,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef CONFIG_ARCH_ARM
 #include "../uORB.h"
+#endif
 
 /**
  * @addtogroup topics @{
@@ -234,6 +236,8 @@ struct vehicle_status_s {
  */
 
 /* register this as object request broker structure */
+#ifdef CONFIG_ARCH_ARM
 ORB_DECLARE(vehicle_status);
+#endif
 
 #endif