diff --git a/libraries/AP_HAL_Linux/AnalogIn.cpp b/libraries/AP_HAL_Linux/AnalogIn.cpp
index 8973949cae..b4fcce8bd8 100644
--- a/libraries/AP_HAL_Linux/AnalogIn.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn.cpp
@@ -1,6 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "AnalogIn.h"
 
 using namespace Linux;
@@ -43,5 +42,3 @@ void AnalogIn::init()
 AP_HAL::AnalogSource* AnalogIn::channel(int16_t n) {
     return new AnalogSource(1.11);
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp b/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp
index e4c59ec2de..38a5b1225d 100644
--- a/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "AnalogIn_ADS1115.h"
 
 AnalogSource_ADS1115::AnalogSource_ADS1115(int16_t pin):
@@ -95,5 +93,3 @@ void AnalogIn_ADS1115::_update()
 
     _last_update_timestamp = AP_HAL::micros();
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/AnalogIn_IIO.cpp b/libraries/AP_HAL_Linux/AnalogIn_IIO.cpp
index a20ae8c8ec..968aa90928 100644
--- a/libraries/AP_HAL_Linux/AnalogIn_IIO.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn_IIO.cpp
@@ -1,7 +1,6 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "AnalogIn_IIO.h"
 
 extern const AP_HAL::HAL& hal;
@@ -125,5 +124,3 @@ void AnalogIn_IIO::init()
 AP_HAL::AnalogSource* AnalogIn_IIO::channel(int16_t pin) {
     return new AnalogSource_IIO(pin, 0.0f, IIO_VOLTAGE_SCALING);
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/AnalogIn_Navio2.cpp b/libraries/AP_HAL_Linux/AnalogIn_Navio2.cpp
index 0e3bfc6c89..b3e4604eb0 100644
--- a/libraries/AP_HAL_Linux/AnalogIn_Navio2.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn_Navio2.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "AnalogIn_Navio2.h"
 
 #include <cstdio>
@@ -124,5 +122,3 @@ void AnalogIn_Navio2::init()
     _board_voltage_pin = channel(0);
     _servorail_pin = channel(1);
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/AnalogIn_Raspilot.cpp b/libraries/AP_HAL_Linux/AnalogIn_Raspilot.cpp
index 52c09840d9..364b227ef9 100644
--- a/libraries/AP_HAL_Linux/AnalogIn_Raspilot.cpp
+++ b/libraries/AP_HAL_Linux/AnalogIn_Raspilot.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "AnalogIn_Raspilot.h"
 #include "px4io_protocol.h"
 
@@ -135,5 +133,3 @@ void AnalogIn_Raspilot::_update()
 
     _last_update_timestamp = AP_HAL::micros();
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/ConsoleDevice.cpp b/libraries/AP_HAL_Linux/ConsoleDevice.cpp
index 5b763ca3e4..4b77f43549 100644
--- a/libraries/AP_HAL_Linux/ConsoleDevice.cpp
+++ b/libraries/AP_HAL_Linux/ConsoleDevice.cpp
@@ -1,6 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "ConsoleDevice.h"
 
 #include <stdio.h>
@@ -80,5 +79,3 @@ void ConsoleDevice::set_blocking(bool blocking)
 void ConsoleDevice::set_speed(uint32_t baudrate)
 {
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/GPIO.cpp b/libraries/AP_HAL_Linux/GPIO.cpp
index d3685a2454..573aa2c954 100644
--- a/libraries/AP_HAL_Linux/GPIO.cpp
+++ b/libraries/AP_HAL_Linux/GPIO.cpp
@@ -1,8 +1,6 @@
 #include <AP_HAL/AP_HAL.h>
 #include "GPIO.h"
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 using namespace Linux;
 
 static const AP_HAL::HAL& hal = AP_HAL::get_HAL();
@@ -32,5 +30,3 @@ void DigitalSource::toggle()
 {
     write(!read());
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/GPIO.h b/libraries/AP_HAL_Linux/GPIO.h
index e3dd25c3cb..60616138dc 100644
--- a/libraries/AP_HAL_Linux/GPIO.h
+++ b/libraries/AP_HAL_Linux/GPIO.h
@@ -2,8 +2,6 @@
 
 #include "AP_HAL_Linux.h"
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 class Linux::DigitalSource : public AP_HAL::DigitalSource {
 public:
     DigitalSource(uint8_t v);
@@ -30,5 +28,3 @@ private:
 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP
 #include "GPIO_Bebop.h"
 #endif
-
-#endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX
diff --git a/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp b/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp
index 80f58b26a6..3e16d2ad14 100644
--- a/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp
+++ b/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp
@@ -2,7 +2,7 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_QFLIGHT
+#if CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_QFLIGHT
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/libraries/AP_HAL_Linux/GPIO_Sysfs.h b/libraries/AP_HAL_Linux/GPIO_Sysfs.h
index 67227e3db4..ef5799b28f 100644
--- a/libraries/AP_HAL_Linux/GPIO_Sysfs.h
+++ b/libraries/AP_HAL_Linux/GPIO_Sysfs.h
@@ -2,8 +2,6 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "AP_HAL_Linux.h"
 #include "GPIO.h"
 
@@ -78,5 +76,3 @@ protected:
      */
     static bool _export_pin(uint8_t vpin);
 };
-
-#endif
diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
index 8cc3b885b5..6b92f8c455 100644
--- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
+++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
@@ -1,11 +1,9 @@
-#include <AP_HAL/AP_HAL.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include <assert.h>
 
 #include "HAL_Linux_Class.h"
 #include "AP_HAL_Linux_Private.h"
 
+#include <AP_HAL/AP_HAL.h>
 #include <AP_HAL/utility/getopt_cpp.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -351,5 +349,3 @@ const AP_HAL::HAL& AP_HAL::get_HAL() {
     static const HAL_Linux hal;
     return hal;
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/I2CDriver.cpp b/libraries/AP_HAL_Linux/I2CDriver.cpp
index 8d676cc310..d9f89e691a 100644
--- a/libraries/AP_HAL_Linux/I2CDriver.cpp
+++ b/libraries/AP_HAL_Linux/I2CDriver.cpp
@@ -1,6 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "I2CDriver.h"
 #include "Util.h"
 
@@ -283,5 +282,3 @@ AP_HAL::Semaphore *I2CDriver::get_semaphore()
 {
     return _fake_dev->get_semaphore();
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/PWM_Sysfs.cpp b/libraries/AP_HAL_Linux/PWM_Sysfs.cpp
index 5b506f8c1c..552bd902f4 100644
--- a/libraries/AP_HAL_Linux/PWM_Sysfs.cpp
+++ b/libraries/AP_HAL_Linux/PWM_Sysfs.cpp
@@ -15,11 +15,8 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "PWM_Sysfs.h"
 
 #include <errno.h>
@@ -283,4 +280,3 @@ PWM_Sysfs_Bebop::PWM_Sysfs_Bebop(uint8_t channel) :
 }
 
 }
-#endif
diff --git a/libraries/AP_HAL_Linux/Perf.cpp b/libraries/AP_HAL_Linux/Perf.cpp
index 6732843ac9..fc897b23e2 100644
--- a/libraries/AP_HAL_Linux/Perf.cpp
+++ b/libraries/AP_HAL_Linux/Perf.cpp
@@ -18,7 +18,7 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && !defined(PERF_LTTNG)
+#if !defined(PERF_LTTNG)
 
 #include <limits.h>
 #include <time.h>
diff --git a/libraries/AP_HAL_Linux/Perf_Lttng.cpp b/libraries/AP_HAL_Linux/Perf_Lttng.cpp
index b537a82191..30eb62df21 100644
--- a/libraries/AP_HAL_Linux/Perf_Lttng.cpp
+++ b/libraries/AP_HAL_Linux/Perf_Lttng.cpp
@@ -16,7 +16,8 @@
 #include <AP_HAL/AP_HAL.h>
 
 #pragma GCC diagnostic ignored "-Wcast-align"
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && defined(PERF_LTTNG)
+#if defined(PERF_LTTNG)
+
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 #include "Perf_Lttng_TracePoints.h"
diff --git a/libraries/AP_HAL_Linux/RCInput.cpp b/libraries/AP_HAL_Linux/RCInput.cpp
index 36b38955f9..9ed9c995ba 100644
--- a/libraries/AP_HAL_Linux/RCInput.cpp
+++ b/libraries/AP_HAL_Linux/RCInput.cpp
@@ -1,6 +1,3 @@
-#include <AP_HAL/AP_HAL.h>
-
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <stdio.h>
 #include <sys/time.h>
 #include <stdio.h>
@@ -16,6 +13,7 @@
 
 #include "RCInput.h"
 #include "sbus.h"
+#include <AP_HAL/AP_HAL.h>
 #include <AP_HAL/utility/dsm.h>
 
 extern const AP_HAL::HAL& hal;
@@ -406,5 +404,3 @@ void RCInput::add_dsm_input(const uint8_t *bytes, size_t nbytes)
         }
     }
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/RCInput_UART.cpp b/libraries/AP_HAL_Linux/RCInput_UART.cpp
index 75628c5166..30dd2bb319 100644
--- a/libraries/AP_HAL_Linux/RCInput_UART.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_UART.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "RCInput_UART.h"
 
 #include <errno.h>
@@ -92,5 +90,3 @@ void RCInput_UART::_timer_tick()
     _pdata = (uint8_t *)&_data;
     _remain = sizeof(_data);
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/RCInput_UDP.cpp b/libraries/AP_HAL_Linux/RCInput_UDP.cpp
index 8d9c4e76af..84cab98258 100644
--- a/libraries/AP_HAL_Linux/RCInput_UDP.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_UDP.cpp
@@ -1,6 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "RCInput_UDP.h"
 #include <stdio.h>
 
@@ -51,4 +50,3 @@ void RCInput_UDP::_timer_tick(void)
         _update_periods(_buf.pwms, RCINPUT_UDP_NUM_CHANNELS);
     }
 }
-#endif
diff --git a/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp b/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp
index bbd6609ac8..b8c615a262 100644
--- a/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp
@@ -1,6 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <stdio.h>
 #include <sys/time.h>
 #include <stdio.h>
@@ -50,5 +49,3 @@ void RCInput_ZYNQ::_timer_tick()
             _process_rc_pulse(_s0_time, (v & 0x7fffffff)/TICK_PER_US);
     }
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp b/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp
index 5754a924ea..07cb6e2592 100644
--- a/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp
@@ -12,8 +12,6 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "RCOutput_AioPRU.h"
 #include <fcntl.h>
 #include <unistd.h>
@@ -128,6 +126,3 @@ void RCOutput_AioPRU::read(uint16_t* period_us, uint8_t len)
       period_us[i] = pwm->channel[i].time_high / TICK_PER_US;
    }
 }
-
-#endif
-
diff --git a/libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp b/libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp
index 55d5f1d8bc..79e1f17aa2 100644
--- a/libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp
@@ -2,8 +2,6 @@
 #include <AP_HAL/AP_HAL.h>
 #include "GPIO.h"
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "RCOutput_PCA9685.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -248,5 +246,3 @@ void RCOutput_PCA9685::read(uint16_t* period_us, uint8_t len)
     for (int i = 0; i < len; i++)
         period_us[i] = read(0 + i);
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/RCOutput_PRU.cpp b/libraries/AP_HAL_Linux/RCOutput_PRU.cpp
index f07bebd6e0..cda8eebf72 100644
--- a/libraries/AP_HAL_Linux/RCOutput_PRU.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_PRU.cpp
@@ -1,8 +1,6 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "RCOutput_PRU.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -88,5 +86,3 @@ void RCOutput_PRU::read(uint16_t* period_us, uint8_t len)
         period_us[i] = sharedMem_cmd->hilo_read[chan_pru_map[i]][1]/TICK_PER_US;
     }
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp b/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp
index 75759aa600..1f99b1382b 100644
--- a/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp
@@ -18,8 +18,6 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "RCOutput_Sysfs.h"
 
 #include <AP_Common/AP_Common.h>
@@ -120,5 +118,3 @@ void RCOutput_Sysfs::read(uint16_t *period_us, uint8_t len)
     }
 }
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp
index 2c94d463ba..ae7fce02fb 100644
--- a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp
+++ b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp
@@ -1,8 +1,6 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "RCOutput_ZYNQ.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -85,5 +83,3 @@ void RCOutput_ZYNQ::read(uint16_t* period_us, uint8_t len)
         period_us[i] = sharedMem_cmd->periodhi[i].hi/TICK_PER_US;
     }
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/RPIOUARTDriver.cpp b/libraries/AP_HAL_Linux/RPIOUARTDriver.cpp
index 8839a41ffc..7afda307e5 100644
--- a/libraries/AP_HAL_Linux/RPIOUARTDriver.cpp
+++ b/libraries/AP_HAL_Linux/RPIOUARTDriver.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "RPIOUARTDriver.h"
 
 #include <stdlib.h>
@@ -289,5 +287,3 @@ void RPIOUARTDriver::_timer_tick(void)
     
     _last_update_timestamp = AP_HAL::micros();
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/SPIDriver.cpp b/libraries/AP_HAL_Linux/SPIDriver.cpp
index d4f831ca56..17b38fa28f 100644
--- a/libraries/AP_HAL_Linux/SPIDriver.cpp
+++ b/libraries/AP_HAL_Linux/SPIDriver.cpp
@@ -1,7 +1,6 @@
 #include <AP_Common/AP_Common.h>
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "SPIDriver.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -290,5 +289,3 @@ AP_HAL::SPIDeviceDriver *SPIDeviceManager::device(enum AP_HAL::SPIDeviceType dev
     }
     return NULL;
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/SPIUARTDriver.cpp b/libraries/AP_HAL_Linux/SPIUARTDriver.cpp
index 638fa193f3..a33ad4c25f 100644
--- a/libraries/AP_HAL_Linux/SPIUARTDriver.cpp
+++ b/libraries/AP_HAL_Linux/SPIUARTDriver.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include <stdlib.h>
 #include <cstdio>
 #include "SPIUARTDriver.h"
@@ -238,5 +236,3 @@ void SPIUARTDriver::_timer_tick(void)
 
     _last_update_timestamp = AP_HAL::micros();
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/Semaphores.cpp b/libraries/AP_HAL_Linux/Semaphores.cpp
index 8dec86f9c4..f617f89e1e 100644
--- a/libraries/AP_HAL_Linux/Semaphores.cpp
+++ b/libraries/AP_HAL_Linux/Semaphores.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "Semaphores.h"
 
 extern const AP_HAL::HAL& hal;
@@ -35,5 +33,3 @@ bool Semaphore::take_nonblocking()
 {
     return pthread_mutex_trylock(&_lock) == 0;
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/Semaphores.h b/libraries/AP_HAL_Linux/Semaphores.h
index fd82d059f9..0286b20e81 100644
--- a/libraries/AP_HAL_Linux/Semaphores.h
+++ b/libraries/AP_HAL_Linux/Semaphores.h
@@ -2,7 +2,6 @@
 
 #include <AP_HAL/AP_HAL_Boards.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include "AP_HAL_Linux.h"
 #include <pthread.h>
 
@@ -17,4 +16,3 @@ public:
 private:
     pthread_mutex_t _lock;
 };
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/Storage.cpp b/libraries/AP_HAL_Linux/Storage.cpp
index 674c45fd32..8b27d18fd9 100644
--- a/libraries/AP_HAL_Linux/Storage.cpp
+++ b/libraries/AP_HAL_Linux/Storage.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -189,5 +187,3 @@ void Storage::_timer_tick(void)
         }
     }
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/Storage_FRAM.cpp b/libraries/AP_HAL_Linux/Storage_FRAM.cpp
index 5ee4e97b6a..5fae90dc54 100644
--- a/libraries/AP_HAL_Linux/Storage_FRAM.cpp
+++ b/libraries/AP_HAL_Linux/Storage_FRAM.cpp
@@ -1,6 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -258,5 +257,3 @@ int8_t Storage_FRAM::transaction(uint8_t* tx, uint8_t* rx, uint16_t len){
     _spi_sem->give();
     return 0;
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/TCPServerDevice.cpp b/libraries/AP_HAL_Linux/TCPServerDevice.cpp
index 36b7b2e676..b86daaa3a2 100644
--- a/libraries/AP_HAL_Linux/TCPServerDevice.cpp
+++ b/libraries/AP_HAL_Linux/TCPServerDevice.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
@@ -120,5 +118,3 @@ void TCPServerDevice::set_blocking(bool blocking)
 void TCPServerDevice::set_speed(uint32_t speed)
 {
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/ToneAlarm.cpp b/libraries/AP_HAL_Linux/ToneAlarm.cpp
index 830f7464e0..129674e6d2 100644
--- a/libraries/AP_HAL_Linux/ToneAlarm.cpp
+++ b/libraries/AP_HAL_Linux/ToneAlarm.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "ToneAlarm.h"
 
 #include <stdio.h>
@@ -255,6 +253,3 @@ bool ToneAlarm::init_tune(){
     wholenote = (60 * 1000L / bpm) * 4;  // this is the time for whole note (in milliseconds)
     return true;
 }
-
-
-#endif
diff --git a/libraries/AP_HAL_Linux/UARTDevice.cpp b/libraries/AP_HAL_Linux/UARTDevice.cpp
index d3a6ba59a7..145596ac1e 100644
--- a/libraries/AP_HAL_Linux/UARTDevice.cpp
+++ b/libraries/AP_HAL_Linux/UARTDevice.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include <termios.h>
 #include <stdio.h>
 #include <errno.h>
@@ -119,5 +117,3 @@ void UARTDevice::set_speed(uint32_t baudrate)
     cfsetspeed(&t, baudrate);
     tcsetattr(_fd, TCSANOW, &t);
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/UARTDriver.cpp b/libraries/AP_HAL_Linux/UARTDriver.cpp
index f0dcc4ef61..a1fc6a1a91 100644
--- a/libraries/AP_HAL_Linux/UARTDriver.cpp
+++ b/libraries/AP_HAL_Linux/UARTDriver.cpp
@@ -2,8 +2,6 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include "UARTDriver.h"
 
 #include <stdio.h>
@@ -628,5 +626,3 @@ void UARTDriver::_timer_tick(void)
 
     _in_timer = false;
 }
-
-#endif // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_Linux/UDPDevice.cpp b/libraries/AP_HAL_Linux/UDPDevice.cpp
index f43c07f147..4a73e4451e 100644
--- a/libraries/AP_HAL_Linux/UDPDevice.cpp
+++ b/libraries/AP_HAL_Linux/UDPDevice.cpp
@@ -1,7 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
@@ -67,5 +65,3 @@ void UDPDevice::set_speed(uint32_t speed)
 {
 
 }
-
-#endif
diff --git a/libraries/AP_HAL_Linux/Util.cpp b/libraries/AP_HAL_Linux/Util.cpp
index 625296f96c..1292983844 100644
--- a/libraries/AP_HAL_Linux/Util.cpp
+++ b/libraries/AP_HAL_Linux/Util.cpp
@@ -1,6 +1,5 @@
 #include <AP_HAL/AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/stat.h>
@@ -206,5 +205,3 @@ close_end:
 end:
     return ret;
 }
-
-#endif // CONFIG_HAL_BOARD == HAL_BOARD_LINUX