diff --git a/libraries/AP_HAL/SIMState.cpp b/libraries/AP_HAL/SIMState.cpp
index 47cd3d4e79bbf..70fcb9abfaca1 100644
--- a/libraries/AP_HAL/SIMState.cpp
+++ b/libraries/AP_HAL/SIMState.cpp
@@ -35,10 +35,16 @@ using namespace AP_HAL;
 #define AP_SIM_FRAME_CLASS MultiCopter
 #elif APM_BUILD_TYPE(APM_BUILD_Heli)
 #define AP_SIM_FRAME_CLASS Helicopter
+#elif APM_BUILD_TYPE(APM_BUILD_AntennaTracker)
+#define AP_SIM_FRAME_CLASS Tracker
 #elif APM_BUILD_TYPE(APM_BUILD_ArduPlane)
 #define AP_SIM_FRAME_CLASS Plane
 #elif APM_BUILD_TYPE(APM_BUILD_Rover)
 #define AP_SIM_FRAME_CLASS SimRover
+#elif APM_BUILD_TYPE(APM_BUILD_Blimp)
+#define AP_SIM_FRAME_CLASS Blimp
+#elif APM_BUILD_TYPE(APM_BUILD_ArduSub)
+#define AP_SIM_FRAME_CLASS Submarine
 #endif
 #endif
 
@@ -47,10 +53,16 @@ using namespace AP_HAL;
 #define AP_SIM_FRAME_STRING "+"
 #elif APM_BUILD_TYPE(APM_BUILD_Heli)
 #define AP_SIM_FRAME_STRING "heli"
+#elif APM_BUILD_TYPE(APM_BUILD_AntennaTracker)
+#define AP_SIM_FRAME_STRING "tracker"
 #elif APM_BUILD_TYPE(APM_BUILD_ArduPlane)
 #define AP_SIM_FRAME_STRING "plane"
 #elif APM_BUILD_TYPE(APM_BUILD_Rover)
 #define AP_SIM_FRAME_STRING "rover"
+#elif APM_BUILD_TYPE(APM_BUILD_Blimp)
+#define AP_SIM_FRAME_STRING "blimp"
+#elif APM_BUILD_TYPE(APM_BUILD_ArduSub)
+#define AP_SIM_FRAME_STRING "sub"
 #endif
 #endif
 
diff --git a/libraries/AP_WindVane/AP_WindVane_SITL.h b/libraries/AP_WindVane/AP_WindVane_SITL.h
index f84d0a815d4e9..bdfe547f4e088 100644
--- a/libraries/AP_WindVane/AP_WindVane_SITL.h
+++ b/libraries/AP_WindVane/AP_WindVane_SITL.h
@@ -28,10 +28,8 @@ class AP_WindVane_SITL : public AP_WindVane_Backend
     using AP_WindVane_Backend::AP_WindVane_Backend;
 
     // update state
-    #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
-        void update_direction() override;
-        void update_speed() override;
-    #endif
+    void update_direction() override;
+    void update_speed() override;
 };
 
 #endif  // AP_WINDVANE_SIM_ENABLED