diff --git a/Software/src/inverter/AFORE-CAN.h b/Software/src/inverter/AFORE-CAN.h
index 113e1033..43068af3 100644
--- a/Software/src/inverter/AFORE-CAN.h
+++ b/Software/src/inverter/AFORE-CAN.h
@@ -2,8 +2,10 @@
 #define AFORE_CAN_H
 #include "../include.h"
 
+#ifdef AFORE_CAN
 #define CAN_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS AforeCanInverter
+#endif
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/BYD-CAN.h b/Software/src/inverter/BYD-CAN.h
index 57853f2e..5aa19a03 100644
--- a/Software/src/inverter/BYD-CAN.h
+++ b/Software/src/inverter/BYD-CAN.h
@@ -2,8 +2,10 @@
 #define BYD_CAN_H
 #include "../include.h"
 
+#ifdef BYD_CAN
 #define CAN_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS BydCanInverter
+#endif
 
 #define FW_MAJOR_VERSION 0x03
 #define FW_MINOR_VERSION 0x29
diff --git a/Software/src/inverter/BYD-MODBUS.h b/Software/src/inverter/BYD-MODBUS.h
index 9d838ddb..d2aa37f6 100644
--- a/Software/src/inverter/BYD-MODBUS.h
+++ b/Software/src/inverter/BYD-MODBUS.h
@@ -2,8 +2,10 @@
 #define BYD_MODBUS_H
 #include "../include.h"
 
+#ifdef BYD_MODBUS
 #define MODBUS_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS BydModbusInverter
+#endif
 
 #include "ModbusInverterProtocol.h"
 
diff --git a/Software/src/inverter/FERROAMP-CAN.h b/Software/src/inverter/FERROAMP-CAN.h
index 34e39544..9c59b0c7 100644
--- a/Software/src/inverter/FERROAMP-CAN.h
+++ b/Software/src/inverter/FERROAMP-CAN.h
@@ -4,8 +4,10 @@
 
 #include "CanInverterProtocol.h"
 
+#ifdef FERROAMP_CAN
 #define CAN_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS FerroampCanInverter
+#endif
 
 class FerroampCanInverter : public CanInverterProtocol {
  public:
diff --git a/Software/src/inverter/FOXESS-CAN.h b/Software/src/inverter/FOXESS-CAN.h
index 08cabe1b..78a90c04 100644
--- a/Software/src/inverter/FOXESS-CAN.h
+++ b/Software/src/inverter/FOXESS-CAN.h
@@ -4,8 +4,10 @@
 
 #include "CanInverterProtocol.h"
 
+#ifdef FOXESS_CAN
 #define CAN_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS FoxessCanInverter
+#endif
 
 class FoxessCanInverter : public CanInverterProtocol {
  public:
diff --git a/Software/src/inverter/GROWATT-HV-CAN.h b/Software/src/inverter/GROWATT-HV-CAN.h
index 677bfc86..168cbaf3 100644
--- a/Software/src/inverter/GROWATT-HV-CAN.h
+++ b/Software/src/inverter/GROWATT-HV-CAN.h
@@ -4,8 +4,10 @@
 
 #include "CanInverterProtocol.h"
 
+#ifdef GROWATT_HV_CAN
 #define CAN_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS GrowattHvInverter
+#endif
 
 class GrowattHvInverter : public CanInverterProtocol {
  public:
diff --git a/Software/src/inverter/GROWATT-LV-CAN.h b/Software/src/inverter/GROWATT-LV-CAN.h
index 65e14bff..7bf3408f 100644
--- a/Software/src/inverter/GROWATT-LV-CAN.h
+++ b/Software/src/inverter/GROWATT-LV-CAN.h
@@ -4,8 +4,10 @@
 
 #include "CanInverterProtocol.h"
 
+#ifdef GROWATT_LV_CAN
 #define CAN_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS GrowattLvInverter
+#endif
 
 class GrowattLvInverter : public CanInverterProtocol {
  public:
diff --git a/Software/src/inverter/INVERTERS.h b/Software/src/inverter/INVERTERS.h
index c2fe8d84..399806b8 100644
--- a/Software/src/inverter/INVERTERS.h
+++ b/Software/src/inverter/INVERTERS.h
@@ -6,81 +6,29 @@ extern InverterProtocol* inverter;
 
 #include "../../USER_SETTINGS.h"
 
-#ifdef AFORE_CAN
 #include "AFORE-CAN.h"
-#endif
 
 #ifdef BYD_CAN_DEYE
 #define BYD_CAN
 #endif
 
-#ifdef BYD_CAN
 #include "BYD-CAN.h"
-#endif
-
-#ifdef BYD_MODBUS
 #include "BYD-MODBUS.h"
-#endif
-
-#ifdef BYD_KOSTAL_RS485
-#include "KOSTAL-RS485.h"
-#endif
-
-#ifdef FERROAMP_CAN
 #include "FERROAMP-CAN.h"
-#endif
-
-#ifdef FOXESS_CAN
 #include "FOXESS-CAN.h"
-#endif
-
-#ifdef GROWATT_HV_CAN
 #include "GROWATT-HV-CAN.h"
-#endif
-
-#ifdef GROWATT_LV_CAN
 #include "GROWATT-LV-CAN.h"
-#endif
-
-#ifdef PYLON_CAN
+#include "KOSTAL-RS485.h"
 #include "PYLON-CAN.h"
-#endif
-
-#ifdef PYLON_LV_CAN
 #include "PYLON-LV-CAN.h"
-#endif
-
-#ifdef SCHNEIDER_CAN
 #include "SCHNEIDER-CAN.h"
-#endif
-
-#ifdef SMA_BYD_H_CAN
 #include "SMA-BYD-H-CAN.h"
-#endif
-
-#ifdef SMA_BYD_HVS_CAN
 #include "SMA-BYD-HVS-CAN.h"
-#endif
-
-#ifdef SMA_LV_CAN
 #include "SMA-LV-CAN.h"
-#endif
-
-#ifdef SMA_TRIPOWER_CAN
 #include "SMA-TRIPOWER-CAN.h"
-#endif
-
-#ifdef SOFAR_CAN
 #include "SOFAR-CAN.h"
-#endif
-
-#ifdef SOLAX_CAN
 #include "SOLAX-CAN.h"
-#endif
-
-#ifdef SUNGROW_CAN
 #include "SUNGROW-CAN.h"
-#endif
 
 void setup_inverter();
 
diff --git a/Software/src/inverter/KOSTAL-RS485.h b/Software/src/inverter/KOSTAL-RS485.h
index 88d90bac..e472a00a 100644
--- a/Software/src/inverter/KOSTAL-RS485.h
+++ b/Software/src/inverter/KOSTAL-RS485.h
@@ -5,8 +5,10 @@
 
 #include "Rs485InverterProtocol.h"
 
+#ifdef BYD_KOSTAL_RS485
 #define RS485_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS KostalInverterProtocol
+#endif
 
 //#define DEBUG_KOSTAL_RS485_DATA  // Enable this line to get TX / RX printed out via logging
 //#define DEBUG_KOSTAL_RS485_DATA_USB  // Enable this line to get TX / RX printed out via USB
diff --git a/Software/src/inverter/PYLON-CAN.h b/Software/src/inverter/PYLON-CAN.h
index 838dfebe..51a84113 100644
--- a/Software/src/inverter/PYLON-CAN.h
+++ b/Software/src/inverter/PYLON-CAN.h
@@ -4,8 +4,10 @@
 
 #include "CanInverterProtocol.h"
 
+#ifdef PYLON_CAN
 #define CAN_INVERTER_SELECTED
 #define SELECTED_INVERTER_CLASS PylonInverter
+#endif
 
 class PylonInverter : public CanInverterProtocol {
  public: