diff --git a/libraries/SITL/SIM_Aircraft.cpp b/libraries/SITL/SIM_Aircraft.cpp
index 30d82d99c3..d48a20c464 100644
--- a/libraries/SITL/SIM_Aircraft.cpp
+++ b/libraries/SITL/SIM_Aircraft.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include <AP_Common/AP_Common.h>
 #include "SIM_Aircraft.h"
 #include <unistd.h>
@@ -291,5 +290,3 @@ void Aircraft::set_speedup(float speedup)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_Balloon.cpp b/libraries/SITL/SIM_Balloon.cpp
index 9d3aa2c999..7799623f0f 100644
--- a/libraries/SITL/SIM_Balloon.cpp
+++ b/libraries/SITL/SIM_Balloon.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_Balloon.h"
 #include <stdio.h>
 
@@ -120,5 +119,3 @@ void Balloon::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_CRRCSim.cpp b/libraries/SITL/SIM_CRRCSim.cpp
index 3446484833..1242f6919c 100644
--- a/libraries/SITL/SIM_CRRCSim.cpp
+++ b/libraries/SITL/SIM_CRRCSim.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_CRRCSim.h"
 #include <stdio.h>
 
@@ -153,5 +152,3 @@ void CRRCSim::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_Gazebo.cpp b/libraries/SITL/SIM_Gazebo.cpp
index fed1785652..2349fda95a 100644
--- a/libraries/SITL/SIM_Gazebo.cpp
+++ b/libraries/SITL/SIM_Gazebo.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_Gazebo.h"
 #include <stdio.h>
 
@@ -128,5 +127,3 @@ void Gazebo::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_Gimbal.cpp b/libraries/SITL/SIM_Gimbal.cpp
index 13e9a7f121..2864b1abbe 100644
--- a/libraries/SITL/SIM_Gimbal.cpp
+++ b/libraries/SITL/SIM_Gimbal.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "SIM_Aircraft.h"
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_Gimbal.h"
 #include <stdio.h>
 
@@ -295,5 +294,3 @@ void Gimbal::send_report(void)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_Gimbal.h b/libraries/SITL/SIM_Gimbal.h
index ba00ca6cab..949d3d613c 100644
--- a/libraries/SITL/SIM_Gimbal.h
+++ b/libraries/SITL/SIM_Gimbal.h
@@ -21,7 +21,6 @@
 #define _SIM_GIMBAL_H
 
 #include "SIM_Aircraft.h"
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include <AP_HAL/utility/Socket.h>
 
 namespace SITL {
@@ -109,6 +108,4 @@ private:
 
 }  // namespace SITL
 
-#endif // CONFIG_HAL_BOARD
-
 #endif // _SIM_GIMBAL_H
diff --git a/libraries/SITL/SIM_Helicopter.cpp b/libraries/SITL/SIM_Helicopter.cpp
index abccf32532..b6ab45468e 100644
--- a/libraries/SITL/SIM_Helicopter.cpp
+++ b/libraries/SITL/SIM_Helicopter.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_Helicopter.h"
 #include <stdio.h>
 
@@ -210,5 +209,3 @@ void Helicopter::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_JSBSim.cpp b/libraries/SITL/SIM_JSBSim.cpp
index 829c2ad5aa..44be88518e 100644
--- a/libraries/SITL/SIM_JSBSim.cpp
+++ b/libraries/SITL/SIM_JSBSim.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 
 #include "SIM_JSBSim.h"
 #include <stdio.h>
@@ -457,5 +456,3 @@ void JSBSim::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_Multicopter.cpp b/libraries/SITL/SIM_Multicopter.cpp
index 774ec4f385..ef231e0692 100644
--- a/libraries/SITL/SIM_Multicopter.cpp
+++ b/libraries/SITL/SIM_Multicopter.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_Multicopter.h"
 #include <stdio.h>
 
@@ -227,5 +226,3 @@ void MultiCopter::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_Rover.cpp b/libraries/SITL/SIM_Rover.cpp
index d29faf95b6..cd35c0dacf 100644
--- a/libraries/SITL/SIM_Rover.cpp
+++ b/libraries/SITL/SIM_Rover.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_Rover.h"
 #include <stdio.h>
 #include <string.h>
@@ -158,5 +157,3 @@ void SimRover::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/SITL/SIM_Tracker.cpp b/libraries/SITL/SIM_Tracker.cpp
index 3994ead4db..bb54e2ef63 100644
--- a/libraries/SITL/SIM_Tracker.cpp
+++ b/libraries/SITL/SIM_Tracker.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "SIM_Tracker.h"
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include <stdio.h>
 
 namespace SITL {
@@ -138,5 +137,3 @@ void Tracker::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif
diff --git a/libraries/SITL/SIM_last_letter.cpp b/libraries/SITL/SIM_last_letter.cpp
index 20f8a3ec96..40a4dc411f 100644
--- a/libraries/SITL/SIM_last_letter.cpp
+++ b/libraries/SITL/SIM_last_letter.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #include "SIM_last_letter.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -144,5 +143,3 @@ void last_letter::update(const struct sitl_input &input)
 }
 
 } // namespace SITL
-
-#endif // CONFIG_HAL_BOARD