diff --git a/libraries/AP_DAL/AP_DAL.h b/libraries/AP_DAL/AP_DAL.h
index 4d415e3bfd..dcbd2f921b 100644
--- a/libraries/AP_DAL/AP_DAL.h
+++ b/libraries/AP_DAL/AP_DAL.h
@@ -17,10 +17,8 @@
 
 #define DAL_CORE(c) AP::dal().logging_core(c)
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
 class NavEKF2;
 class NavEKF3;
-#endif
 
 class AP_DAL {
 public:
@@ -222,7 +220,6 @@ public:
     void writeBodyFrameOdom(float quality, const Vector3f &delPos, const Vector3f &delAng, float delTime, uint32_t timeStamp_ms, uint16_t delay_ms, const Vector3f &posOffset);
 
     // Replay support:
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RFRH &msg) {
         _RFRH = msg;
         _micros = _RFRH.time_us;
@@ -297,7 +294,6 @@ public:
     void handle_message(const log_REVH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3);
     void handle_message(const log_RWOH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3);
     void handle_message(const log_RBOH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3);
-#endif
 
     // map core number for replay
     uint8_t logging_core(uint8_t c) const;
diff --git a/libraries/AP_DAL/AP_DAL_Airspeed.h b/libraries/AP_DAL/AP_DAL_Airspeed.h
index e4f535812f..4a390cdd37 100644
--- a/libraries/AP_DAL/AP_DAL_Airspeed.h
+++ b/libraries/AP_DAL/AP_DAL_Airspeed.h
@@ -47,14 +47,12 @@ public:
 
     void start_frame();
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RASH &msg) {
         _RASH = msg;
     }
     void handle_message(const log_RASI &msg) {
         _RASI[msg.instance] = msg;
     }
-#endif
 
 private:
 
diff --git a/libraries/AP_DAL/AP_DAL_Baro.h b/libraries/AP_DAL/AP_DAL_Baro.h
index e04d990d28..f29859c919 100644
--- a/libraries/AP_DAL/AP_DAL_Baro.h
+++ b/libraries/AP_DAL/AP_DAL_Baro.h
@@ -40,14 +40,12 @@ public:
 
     void start_frame();
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RBRH &msg) {
         _RBRH = msg;
     }
     void handle_message(const log_RBRI &msg) {
         _RBRI[msg.instance] = msg;
     }
-#endif
 
 private:
 
diff --git a/libraries/AP_DAL/AP_DAL_Beacon.h b/libraries/AP_DAL/AP_DAL_Beacon.h
index 920144296d..f3b05e4e67 100644
--- a/libraries/AP_DAL/AP_DAL_Beacon.h
+++ b/libraries/AP_DAL/AP_DAL_Beacon.h
@@ -61,14 +61,12 @@ public:
 
     void start_frame();
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RBCH &msg) {
         _RBCH = msg;
-   }
+    }
     void handle_message(const log_RBCI &msg) {
         _RBCI[msg.instance] = msg;
     }
-#endif
 
 private:
 
diff --git a/libraries/AP_DAL/AP_DAL_Compass.h b/libraries/AP_DAL/AP_DAL_Compass.h
index 6b5003b10c..ffd2830c78 100644
--- a/libraries/AP_DAL/AP_DAL_Compass.h
+++ b/libraries/AP_DAL/AP_DAL_Compass.h
@@ -58,14 +58,12 @@ public:
 
     void start_frame();
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RMGH &msg) {
         _RMGH = msg;
     }
     void handle_message(const log_RMGI &msg) {
         _RMGI[msg.instance] = msg;
     }
-#endif
 
 private:
 
diff --git a/libraries/AP_DAL/AP_DAL_GPS.h b/libraries/AP_DAL/AP_DAL_GPS.h
index 39dc6b79d7..8886411c53 100644
--- a/libraries/AP_DAL/AP_DAL_GPS.h
+++ b/libraries/AP_DAL/AP_DAL_GPS.h
@@ -130,7 +130,6 @@ public:
 
     void start_frame();
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RGPH &msg) {
         _RGPH = msg;
     }
@@ -140,7 +139,6 @@ public:
     void handle_message(const log_RGPJ &msg) {
         _RGPJ[msg.instance] = msg;
     }
-#endif
 
 private:
 
diff --git a/libraries/AP_DAL/AP_DAL_InertialSensor.h b/libraries/AP_DAL/AP_DAL_InertialSensor.h
index 35749aea73..36abc98865 100644
--- a/libraries/AP_DAL/AP_DAL_InertialSensor.h
+++ b/libraries/AP_DAL/AP_DAL_InertialSensor.h
@@ -53,7 +53,6 @@ public:
 
     void start_frame();
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RISH &msg) {
         _RISH = msg;
     }
@@ -62,7 +61,6 @@ public:
         pos[msg.instance] = AP::ins().get_imu_pos_offset(msg.instance);
         update_filtered(msg.instance);
     }
-#endif
 
 private:
     // filter constant for deltas to gyro/accel
diff --git a/libraries/AP_DAL/AP_DAL_RangeFinder.h b/libraries/AP_DAL/AP_DAL_RangeFinder.h
index 53125a6315..2f8edbc5c8 100644
--- a/libraries/AP_DAL/AP_DAL_RangeFinder.h
+++ b/libraries/AP_DAL/AP_DAL_RangeFinder.h
@@ -30,14 +30,12 @@ public:
 
     class AP_DAL_RangeFinder_Backend *get_backend(uint8_t id) const;
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RRNH &msg) {
         _RRNH = msg;
     }
     void handle_message(const log_RRNI &msg) {
         _RRNI[msg.instance] = msg;
     }
-#endif
 
 private:
 
diff --git a/libraries/AP_DAL/AP_DAL_VisualOdom.h b/libraries/AP_DAL/AP_DAL_VisualOdom.h
index 9ae8f4a543..83f2c00ab2 100644
--- a/libraries/AP_DAL/AP_DAL_VisualOdom.h
+++ b/libraries/AP_DAL/AP_DAL_VisualOdom.h
@@ -38,11 +38,9 @@ public:
 
     void start_frame();
 
-#if APM_BUILD_TYPE(APM_BUILD_Replay)
     void handle_message(const log_RVOH &msg) {
         RVOH = msg;
    }
-#endif
 
 private: