diff --git a/libraries/AP_HAL/SIMState.cpp b/libraries/AP_HAL/SIMState.cpp
index 960ccfaaf9..5562154a64 100644
--- a/libraries/AP_HAL/SIMState.cpp
+++ b/libraries/AP_HAL/SIMState.cpp
@@ -9,6 +9,9 @@
  */
 
 #include <SITL/SIM_Multicopter.h>
+#include <SITL/SIM_Plane.h>
+
+#include <AP_Baro/AP_Baro.h>
 
 extern const AP_HAL::HAL& hal;
 
@@ -21,7 +24,11 @@ void SIMState::update()
     static bool init_done;
     if (!init_done) {
         init_done = true;
+#if APM_BUILD_TYPE(APM_BUILD_ArduCopter)
         sitl_model = SITL::MultiCopter::create("+");
+#elif APM_BUILD_TYPE(APM_BUILD_ArduPlane)
+        sitl_model = SITL::Plane::create("plane");
+#endif
     }
 
     _fdm_input_step();
diff --git a/libraries/AP_HAL/SIMState.h b/libraries/AP_HAL/SIMState.h
index 0f537c0262..02f2028dc0 100644
--- a/libraries/AP_HAL/SIMState.h
+++ b/libraries/AP_HAL/SIMState.h
@@ -6,10 +6,6 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#include <AP_Baro/AP_Baro.h>
-#include <AP_InertialSensor/AP_InertialSensor.h>
-#include <AP_Compass/AP_Compass.h>
-#include <AP_Terrain/AP_Terrain.h>
 #include <SITL/SITL_Input.h>
 #include <SITL/SIM_Gimbal.h>
 #include <SITL/SIM_ADSB.h>
@@ -90,7 +86,7 @@ private:
     pid_t _parent_pid;
     uint32_t _update_count;
 
-    AP_Baro *_barometer;
+    class AP_Baro *_barometer;
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
     SocketAPM _sitl_rc_in{true};