diff --git a/Software/Software.ino b/Software/Software.ino
index 576e32c2..4f9a1078 100644
--- a/Software/Software.ino
+++ b/Software/Software.ino
@@ -9,6 +9,8 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
+#include "src/battery/BATTERIES.h"
+#include "src/charger/CHARGERS.h"
 #include "src/communication/Transmitter.h"
 #include "src/communication/can/comm_can.h"
 #include "src/communication/contactorcontrol/comm_contactorcontrol.h"
@@ -22,11 +24,16 @@
 #include "src/devboard/utils/events.h"
 #include "src/devboard/utils/led_handler.h"
 #include "src/devboard/utils/logging.h"
+#include "src/devboard/utils/time_meas.h"
 #include "src/devboard/utils/timer.h"
 #include "src/devboard/utils/value_mapping.h"
 #include "src/devboard/webserver/webserver.h"
 #include "src/devboard/wifi/wifi.h"
-#include "src/include.h"
+#include "src/inverter/INVERTERS.h"
+
+#if !defined(HW_LILYGO) && !defined(HW_STARK) && !defined(HW_3LB) && !defined(HW_DEVKIT)
+#error You must select a target hardware in the USER_SETTINGS.h file!
+#endif
 
 #ifdef PERIODIC_BMS_RESET_AT
 #include "src/devboard/utils/ntp_time.h"
diff --git a/Software/src/battery/BATTERIES.cpp b/Software/src/battery/BATTERIES.cpp
index 2906327c..f327ed58 100644
--- a/Software/src/battery/BATTERIES.cpp
+++ b/Software/src/battery/BATTERIES.cpp
@@ -1,5 +1,4 @@
-#include "../include.h"
-
+#include "BATTERIES.h"
 #include "../datalayer/datalayer_extended.h"
 #include "CanBattery.h"
 #include "RS485Battery.h"
diff --git a/Software/src/battery/BMW-I3-BATTERY.cpp b/Software/src/battery/BMW-I3-BATTERY.cpp
index 7d0d2ee8..fcd70311 100644
--- a/Software/src/battery/BMW-I3-BATTERY.cpp
+++ b/Software/src/battery/BMW-I3-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Do not change code below unless you are sure what you are doing */
 
diff --git a/Software/src/battery/BMW-I3-BATTERY.h b/Software/src/battery/BMW-I3-BATTERY.h
index aaa0b94b..1e49a677 100644
--- a/Software/src/battery/BMW-I3-BATTERY.h
+++ b/Software/src/battery/BMW-I3-BATTERY.h
@@ -2,9 +2,9 @@
 #define BMW_I3_BATTERY_H
 
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "BMW-I3-HTML.h"
 #include "CanBattery.h"
+#include "src/devboard/hal/hal.h"
 
 #ifdef BMW_I3_BATTERY
 #define SELECTED_BATTERY_CLASS BmwI3Battery
diff --git a/Software/src/battery/BMW-I3-HTML.cpp b/Software/src/battery/BMW-I3-HTML.cpp
index b982adf4..a0d8931c 100644
--- a/Software/src/battery/BMW-I3-HTML.cpp
+++ b/Software/src/battery/BMW-I3-HTML.cpp
@@ -1,5 +1,4 @@
 #include "BMW-I3-HTML.h"
-#include "../include.h"
 #include "BMW-I3-BATTERY.h"
 
 // Helper function for safe array access
diff --git a/Software/src/battery/BMW-IX-BATTERY.cpp b/Software/src/battery/BMW-IX-BATTERY.cpp
index e354d2c5..018ccf38 100644
--- a/Software/src/battery/BMW-IX-BATTERY.cpp
+++ b/Software/src/battery/BMW-IX-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 // Function to check if a value has gone stale over a specified time period
 bool BmwIXBattery::isStale(int16_t currentValue, uint16_t& lastValue, unsigned long& lastChangeTime) {
diff --git a/Software/src/battery/BMW-IX-BATTERY.h b/Software/src/battery/BMW-IX-BATTERY.h
index af11a73e..5ac86cca 100644
--- a/Software/src/battery/BMW-IX-BATTERY.h
+++ b/Software/src/battery/BMW-IX-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef BMW_IX_BATTERY_H
 #define BMW_IX_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "BMW-IX-HTML.h"
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/BMW-IX-HTML.cpp b/Software/src/battery/BMW-IX-HTML.cpp
index 60802c49..a93d313a 100644
--- a/Software/src/battery/BMW-IX-HTML.cpp
+++ b/Software/src/battery/BMW-IX-HTML.cpp
@@ -1,5 +1,4 @@
 #include "BMW-IX-HTML.h"
-#include "../include.h"
 #include "BMW-IX-BATTERY.h"
 
 String BmwIXHtmlRenderer::get_status_html() {
diff --git a/Software/src/battery/BMW-PHEV-BATTERY.cpp b/Software/src/battery/BMW-PHEV-BATTERY.cpp
index 0a9d2d96..c59dcc24 100644
--- a/Software/src/battery/BMW-PHEV-BATTERY.cpp
+++ b/Software/src/battery/BMW-PHEV-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 const unsigned char crc8_table[256] =
     {  // CRC8_SAE_J1850_ZER0 formula,0x1D Poly,initial value 0x3F,Final XOR value varies
diff --git a/Software/src/battery/BMW-PHEV-BATTERY.h b/Software/src/battery/BMW-PHEV-BATTERY.h
index 98f0e640..b6a050a1 100644
--- a/Software/src/battery/BMW-PHEV-BATTERY.h
+++ b/Software/src/battery/BMW-PHEV-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef BMW_PHEV_BATTERY_H
 #define BMW_PHEV_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "BMW-PHEV-HTML.h"
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/BMW-SBOX.cpp b/Software/src/battery/BMW-SBOX.cpp
index 4656c39c..8b0f2ea9 100644
--- a/Software/src/battery/BMW-SBOX.cpp
+++ b/Software/src/battery/BMW-SBOX.cpp
@@ -1,7 +1,6 @@
 #include "BMW-SBOX.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 uint8_t reverse_bits(uint8_t byte) {
   uint8_t reversed = 0;
diff --git a/Software/src/battery/BMW-SBOX.h b/Software/src/battery/BMW-SBOX.h
index 51af6eb9..f5144b0e 100644
--- a/Software/src/battery/BMW-SBOX.h
+++ b/Software/src/battery/BMW-SBOX.h
@@ -1,6 +1,5 @@
 #ifndef BMW_SBOX_CONTROL_H
 #define BMW_SBOX_CONTROL_H
-#include "../include.h"
 
 #ifdef BMW_SBOX
 #define SELECTED_SHUNT_CLASS BmwSbox
diff --git a/Software/src/battery/BOLT-AMPERA-BATTERY.cpp b/Software/src/battery/BOLT-AMPERA-BATTERY.cpp
index 6f5fbabd..7fec034d 100644
--- a/Software/src/battery/BOLT-AMPERA-BATTERY.cpp
+++ b/Software/src/battery/BOLT-AMPERA-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /*
 TODOs left for this implementation
diff --git a/Software/src/battery/BOLT-AMPERA-BATTERY.h b/Software/src/battery/BOLT-AMPERA-BATTERY.h
index 6132829a..8582741e 100644
--- a/Software/src/battery/BOLT-AMPERA-BATTERY.h
+++ b/Software/src/battery/BOLT-AMPERA-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef BOLT_AMPERA_BATTERY_H
 #define BOLT_AMPERA_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "BOLT-AMPERA-HTML.h"
 #include "CanBattery.h"
diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
index 0d01726d..97db58ad 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Notes
 SOC% by default is now ESTIMATED.
diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.h b/Software/src/battery/BYD-ATTO-3-BATTERY.h
index 9a75707b..a34c32dd 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.h
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.h
@@ -3,7 +3,6 @@
 
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 
 #include "BYD-ATTO-3-HTML.h"
 #include "CanBattery.h"
diff --git a/Software/src/battery/Battery.h b/Software/src/battery/Battery.h
index 6abfa91e..a9a2c997 100644
--- a/Software/src/battery/Battery.h
+++ b/Software/src/battery/Battery.h
@@ -64,7 +64,7 @@ class Battery {
   virtual void update_values() = 0;
 
   // The name of the comm interface the battery is using.
-  virtual String interface_name() = 0;
+  virtual const char* interface_name() = 0;
 
   // These are commands from external I/O (UI, MQTT etc.)
   // Override in battery if it supports them. Otherwise they are NOP.
diff --git a/Software/src/battery/CELLPOWER-BMS.cpp b/Software/src/battery/CELLPOWER-BMS.cpp
index 4fe111fe..04407fc4 100644
--- a/Software/src/battery/CELLPOWER-BMS.cpp
+++ b/Software/src/battery/CELLPOWER-BMS.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void CellPowerBms::update_values() {
 
diff --git a/Software/src/battery/CELLPOWER-BMS.h b/Software/src/battery/CELLPOWER-BMS.h
index 77eb9713..0b1c2a23 100644
--- a/Software/src/battery/CELLPOWER-BMS.h
+++ b/Software/src/battery/CELLPOWER-BMS.h
@@ -1,7 +1,6 @@
 #ifndef CELLPOWER_BMS_H
 #define CELLPOWER_BMS_H
 #include <Arduino.h>
-#include "../include.h"
 #include "CELLPOWER-HTML.h"
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/CHADEMO-BATTERY.cpp b/Software/src/battery/CHADEMO-BATTERY.cpp
index 0e573cfa..5ec6217f 100644
--- a/Software/src/battery/CHADEMO-BATTERY.cpp
+++ b/Software/src/battery/CHADEMO-BATTERY.cpp
@@ -1,7 +1,6 @@
 #include "CHADEMO-BATTERY.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 #include "CHADEMO-SHUNTS.h"
 
 //This function maps all the values fetched via CAN to the correct parameters used for the inverter
diff --git a/Software/src/battery/CHADEMO-BATTERY.h b/Software/src/battery/CHADEMO-BATTERY.h
index 23d56828..180d19cf 100644
--- a/Software/src/battery/CHADEMO-BATTERY.h
+++ b/Software/src/battery/CHADEMO-BATTERY.h
@@ -3,9 +3,9 @@
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CHADEMO-BATTERY-HTML.h"
 #include "CanBattery.h"
+#include "src/devboard/hal/hal.h"
 
 #ifdef CHADEMO_BATTERY
 #define SELECTED_BATTERY_CLASS ChademoBattery
diff --git a/Software/src/battery/CHADEMO-SHUNTS.cpp b/Software/src/battery/CHADEMO-SHUNTS.cpp
index bc5bc641..aa1503f7 100644
--- a/Software/src/battery/CHADEMO-SHUNTS.cpp
+++ b/Software/src/battery/CHADEMO-SHUNTS.cpp
@@ -21,8 +21,8 @@
 #include "CHADEMO-SHUNTS.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 #include "CHADEMO-BATTERY.h"
+#include "src/devboard/utils/logging.h"
 
 /* Initial frames received from ISA shunts provide invalid during initialization */
 static int framecount = 0;
diff --git a/Software/src/battery/CMFA-EV-BATTERY.cpp b/Software/src/battery/CMFA-EV-BATTERY.cpp
index 07274d59..6923c29e 100644
--- a/Software/src/battery/CMFA-EV-BATTERY.cpp
+++ b/Software/src/battery/CMFA-EV-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* The raw SOC value sits at 90% when the battery is full, so we should report back 100% once this value is reached
 Same goes for low point, when 10% is reached we report 0% */
diff --git a/Software/src/battery/CMFA-EV-BATTERY.h b/Software/src/battery/CMFA-EV-BATTERY.h
index 84f1dc1c..048e386a 100644
--- a/Software/src/battery/CMFA-EV-BATTERY.h
+++ b/Software/src/battery/CMFA-EV-BATTERY.h
@@ -1,6 +1,5 @@
 #ifndef CMFA_EV_BATTERY_H
 #define CMFA_EV_BATTERY_H
-#include "../include.h"
 
 #include "CMFA-EV-HTML.h"
 #include "CanBattery.h"
diff --git a/Software/src/battery/CanBattery.cpp b/Software/src/battery/CanBattery.cpp
index ad6dadca..a0f47cf0 100644
--- a/Software/src/battery/CanBattery.cpp
+++ b/Software/src/battery/CanBattery.cpp
@@ -1,5 +1,4 @@
 #include "CanBattery.h"
-#include "../../src/include.h"
 
 CanBattery::CanBattery(CAN_Speed speed) {
   can_interface = can_config.battery;
diff --git a/Software/src/battery/CanBattery.h b/Software/src/battery/CanBattery.h
index aaae7d85..db4b0894 100644
--- a/Software/src/battery/CanBattery.h
+++ b/Software/src/battery/CanBattery.h
@@ -3,6 +3,7 @@
 
 #include "Battery.h"
 
+#include "USER_SETTINGS.h"
 #include "src/communication/Transmitter.h"
 #include "src/communication/can/CanReceiver.h"
 #include "src/communication/can/comm_can.h"
@@ -14,7 +15,7 @@ class CanBattery : public Battery, Transmitter, CanReceiver {
   virtual void handle_incoming_can_frame(CAN_frame rx_frame) = 0;
   virtual void transmit_can(unsigned long currentMillis) = 0;
 
-  String interface_name() { return getCANInterfaceName(can_interface); }
+  const char* interface_name() { return getCANInterfaceName(can_interface); }
 
   void transmit(unsigned long currentMillis) { transmit_can(currentMillis); }
 
diff --git a/Software/src/battery/DALY-BMS.cpp b/Software/src/battery/DALY-BMS.cpp
index 485c68f9..3d7666c9 100644
--- a/Software/src/battery/DALY-BMS.cpp
+++ b/Software/src/battery/DALY-BMS.cpp
@@ -1,8 +1,8 @@
 #include "DALY-BMS.h"
 #include <cstdint>
 #include "../datalayer/datalayer.h"
+#include "../devboard/hal/hal.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Do not change code below unless you are sure what you are doing */
 
diff --git a/Software/src/battery/ECMP-BATTERY.cpp b/Software/src/battery/ECMP-BATTERY.cpp
index 472d94b2..4b25c079 100644
--- a/Software/src/battery/ECMP-BATTERY.cpp
+++ b/Software/src/battery/ECMP-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For More Battery Info page
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO:
 This integration is still ongoing. Here is what still needs to be done in order to use this battery type
diff --git a/Software/src/battery/ECMP-BATTERY.h b/Software/src/battery/ECMP-BATTERY.h
index 92fddf99..2003d5cd 100644
--- a/Software/src/battery/ECMP-BATTERY.h
+++ b/Software/src/battery/ECMP-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef STELLANTIS_ECMP_BATTERY_H
 #define STELLANTIS_ECMP_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "ECMP-HTML.h"
diff --git a/Software/src/battery/FOXESS-BATTERY.cpp b/Software/src/battery/FOXESS-BATTERY.cpp
index 4c8fe2d5..6ec0509e 100644
--- a/Software/src/battery/FOXESS-BATTERY.cpp
+++ b/Software/src/battery/FOXESS-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /*
 Can bus @ 500k - all Extended ID, little endian
diff --git a/Software/src/battery/FOXESS-BATTERY.h b/Software/src/battery/FOXESS-BATTERY.h
index 6e46e0d5..da4b39de 100644
--- a/Software/src/battery/FOXESS-BATTERY.h
+++ b/Software/src/battery/FOXESS-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef FOXESS_BATTERY_H
 #define FOXESS_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp
index dca21aa4..40c047f4 100644
--- a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp
+++ b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO
 - Contactor closing: CAN log needed from complete H-CAN of Geely Geometry C vehicle. We are not sure what needs to be sent towards the battery yet to get contactor closing working. DTC readout complains that a "Power CAN BUS Data Missing" message is still missing
diff --git a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h
index daa511b5..31accda6 100644
--- a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h
+++ b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h
@@ -2,7 +2,6 @@
 #define GEELY_GEOMETRY_C_BATTERY_H
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "GEELY-GEOMETRY-C-HTML.h"
 
diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
index 69e4478e..2db084a0 100644
--- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
+++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 //Code still work in progress, TODO:
 //Figure out if CAN messages need to be sent to keep the system happy?
diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
index 46d81c73..c22e981c 100644
--- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
+++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef IMIEV_CZERO_ION_BATTERY_H
 #define IMIEV_CZERO_ION_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
index 93542e2a..443e6d98 100644
--- a/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
+++ b/Software/src/battery/JAGUAR-IPACE-BATTERY.cpp
@@ -2,7 +2,7 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
+#include "../devboard/utils/logging.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillisKeepAlive = 0;
diff --git a/Software/src/battery/KIA-E-GMP-BATTERY.cpp b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
index c5d33313..6952e51a 100644
--- a/Software/src/battery/KIA-E-GMP-BATTERY.cpp
+++ b/Software/src/battery/KIA-E-GMP-BATTERY.cpp
@@ -2,7 +2,7 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
+#include "../system_settings.h"
 
 const unsigned char crc8_table[256] =
     {  // CRC8_SAE_J1850_ZER0 formula,0x1D Poly,initial value 0x3F,Final XOR value varies
diff --git a/Software/src/battery/KIA-E-GMP-BATTERY.h b/Software/src/battery/KIA-E-GMP-BATTERY.h
index dcbc4890..b726d33e 100644
--- a/Software/src/battery/KIA-E-GMP-BATTERY.h
+++ b/Software/src/battery/KIA-E-GMP-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef KIA_E_GMP_BATTERY_H
 #define KIA_E_GMP_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "CanBattery.h"
 
 #define ESTIMATE_SOC_FROM_CELLVOLTAGE
diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
index a3c0199e..f933861a 100644
--- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
+++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void KiaHyundai64Battery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for modbus
diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
index 625b1794..60505cb6 100644
--- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
+++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
@@ -3,7 +3,6 @@
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "KIA-HYUNDAI-64-HTML.h"
 
diff --git a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
index 74b5a418..ff87dc4d 100644
--- a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
+++ b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO: 
 - The HEV battery seems to turn off after 1 minute of use. When this happens SOC% stops updating.
diff --git a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h
index 00e96799..5b667875 100644
--- a/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h
+++ b/Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef KIA_HYUNDAI_HYBRID_BATTERY_H
 #define KIA_HYUNDAI_HYBRID_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/MEB-BATTERY.cpp b/Software/src/battery/MEB-BATTERY.cpp
index 646c3fa4..6edc41b0 100644
--- a/Software/src/battery/MEB-BATTERY.cpp
+++ b/Software/src/battery/MEB-BATTERY.cpp
@@ -5,7 +5,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /*
 TODO list
diff --git a/Software/src/battery/MEB-BATTERY.h b/Software/src/battery/MEB-BATTERY.h
index e7cae4d4..6c2052c0 100644
--- a/Software/src/battery/MEB-BATTERY.h
+++ b/Software/src/battery/MEB-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef MEB_BATTERY_H
 #define MEB_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "CanBattery.h"
 #include "MEB-HTML.h"
 
diff --git a/Software/src/battery/MG-5-BATTERY.cpp b/Software/src/battery/MG-5-BATTERY.cpp
index db22adc2..90c486ca 100644
--- a/Software/src/battery/MG-5-BATTERY.cpp
+++ b/Software/src/battery/MG-5-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO: 
 - Get contactor closing working
diff --git a/Software/src/battery/MG-5-BATTERY.h b/Software/src/battery/MG-5-BATTERY.h
index e5468126..3b4cf99b 100644
--- a/Software/src/battery/MG-5-BATTERY.h
+++ b/Software/src/battery/MG-5-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef MG_5_BATTERY_H
 #define MG_5_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/MG-HS-PHEV-BATTERY.cpp b/Software/src/battery/MG-HS-PHEV-BATTERY.cpp
index bce0dca5..a9d6f881 100644
--- a/Software/src/battery/MG-HS-PHEV-BATTERY.cpp
+++ b/Software/src/battery/MG-HS-PHEV-BATTERY.cpp
@@ -1,10 +1,9 @@
-#include "../include.h"
 #ifdef MG_HS_PHEV_BATTERY_H
+#include "MG-HS-PHEV-BATTERY.h"
 #include "../communication/can/comm_can.h"
 #include "../communication/contactorcontrol/comm_contactorcontrol.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "MG-HS-PHEV-BATTERY.h"
 
 /*
 MG HS PHEV 16.6kWh battery integration
diff --git a/Software/src/battery/MG-HS-PHEV-BATTERY.h b/Software/src/battery/MG-HS-PHEV-BATTERY.h
index e57360f2..bc51ef57 100644
--- a/Software/src/battery/MG-HS-PHEV-BATTERY.h
+++ b/Software/src/battery/MG-HS-PHEV-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef MG_HS_PHEV_BATTERY_H
 #define MG_HS_PHEV_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
index 31e9042a..398ce59c 100644
--- a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
+++ b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp
@@ -4,8 +4,8 @@
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
 #include "../devboard/utils/logging.h"
-#include "../include.h"
 
+#include "../charger/CHARGERS.h"
 #include "../charger/CanCharger.h"
 
 uint16_t Temp_fromRAW_to_F(uint16_t temperature);
diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.h b/Software/src/battery/NISSAN-LEAF-BATTERY.h
index 0f6e3ad0..46364a74 100644
--- a/Software/src/battery/NISSAN-LEAF-BATTERY.h
+++ b/Software/src/battery/NISSAN-LEAF-BATTERY.h
@@ -3,7 +3,6 @@
 
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "NISSAN-LEAF-HTML.h"
 
diff --git a/Software/src/battery/ORION-BMS.cpp b/Software/src/battery/ORION-BMS.cpp
index a8688b56..00445cc1 100644
--- a/Software/src/battery/ORION-BMS.cpp
+++ b/Software/src/battery/ORION-BMS.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void findMinMaxCellvoltages(const uint16_t arr[], size_t size, uint16_t& Minimum_Cell_Voltage,
                             uint16_t& Maximum_Cell_Voltage) {
diff --git a/Software/src/battery/ORION-BMS.h b/Software/src/battery/ORION-BMS.h
index 5e4e51e7..574dc1b9 100644
--- a/Software/src/battery/ORION-BMS.h
+++ b/Software/src/battery/ORION-BMS.h
@@ -1,8 +1,8 @@
 #ifndef ORION_BMS_H
 #define ORION_BMS_H
 #include <Arduino.h>
-#include "../include.h"
 
+#include "../system_settings.h"
 #include "CanBattery.h"
 
 #ifdef ORION_BMS
diff --git a/Software/src/battery/PYLON-BATTERY.cpp b/Software/src/battery/PYLON-BATTERY.cpp
index 5b91606b..c2a8ac40 100644
--- a/Software/src/battery/PYLON-BATTERY.cpp
+++ b/Software/src/battery/PYLON-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void PylonBattery::update_values() {
 
diff --git a/Software/src/battery/PYLON-BATTERY.h b/Software/src/battery/PYLON-BATTERY.h
index 4e222eec..a3dff79a 100644
--- a/Software/src/battery/PYLON-BATTERY.h
+++ b/Software/src/battery/PYLON-BATTERY.h
@@ -3,7 +3,6 @@
 #include <Arduino.h>
 
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef PYLON_BATTERY
diff --git a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp
index a401ad8e..e34cd9ef 100644
--- a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp
+++ b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO
 - LOG files from vehicle needed to determine CAN content needed to send towards battery!
diff --git a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h
index 4e7de815..85ec3d04 100644
--- a/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h
+++ b/Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef RANGE_ROVER_PHEV_BATTERY_H
 #define RANGE_ROVER_PHEV_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp b/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
index e719d287..12fb991a 100644
--- a/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-KANGOO-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO:
 There seems to be some values on the Kangoo that differ between the 22/33 kWh version
diff --git a/Software/src/battery/RENAULT-KANGOO-BATTERY.h b/Software/src/battery/RENAULT-KANGOO-BATTERY.h
index f892852b..76dc0e8b 100644
--- a/Software/src/battery/RENAULT-KANGOO-BATTERY.h
+++ b/Software/src/battery/RENAULT-KANGOO-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef RENAULT_KANGOO_BATTERY_H
 #define RENAULT_KANGOO_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/RENAULT-TWIZY.cpp b/Software/src/battery/RENAULT-TWIZY.cpp
index 21aa8a46..3fa74fb1 100644
--- a/Software/src/battery/RENAULT-TWIZY.cpp
+++ b/Software/src/battery/RENAULT-TWIZY.cpp
@@ -2,7 +2,6 @@
 #include <cstdint>
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 int16_t max_value(int16_t* entries, size_t len) {
   int result = INT16_MIN;
diff --git a/Software/src/battery/RENAULT-TWIZY.h b/Software/src/battery/RENAULT-TWIZY.h
index 325d6f43..d9c71f7d 100644
--- a/Software/src/battery/RENAULT-TWIZY.h
+++ b/Software/src/battery/RENAULT-TWIZY.h
@@ -1,6 +1,5 @@
 #ifndef RENAULT_TWIZY_BATTERY_H
 #define RENAULT_TWIZY_BATTERY_H
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef RENAULT_TWIZY_BATTERY
diff --git a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
index 66aa3bdd..095fb6a1 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void transmit_can_frame(CAN_frame* tx_frame, int interface);
 
diff --git a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
index a2fcf7ee..19baa4eb 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
+++ b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO
 - Add //NVROL Reset
diff --git a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h
index c375b996..2cfaa2b8 100644
--- a/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h
+++ b/Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h
@@ -1,6 +1,5 @@
 #ifndef RENAULT_ZOE_GEN2_BATTERY_H
 #define RENAULT_ZOE_GEN2_BATTERY_H
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "RENAULT-ZOE-GEN2-HTML.h"
diff --git a/Software/src/battery/RJXZS-BMS.cpp b/Software/src/battery/RJXZS-BMS.cpp
index ddb5b95d..3d3cffe5 100644
--- a/Software/src/battery/RJXZS-BMS.cpp
+++ b/Software/src/battery/RJXZS-BMS.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void RjxzsBms::update_values() {
 
diff --git a/Software/src/battery/RJXZS-BMS.h b/Software/src/battery/RJXZS-BMS.h
index ff5eae70..7b2b660f 100644
--- a/Software/src/battery/RJXZS-BMS.h
+++ b/Software/src/battery/RJXZS-BMS.h
@@ -1,8 +1,8 @@
 #ifndef RJXZS_BMS_H
 #define RJXZS_BMS_H
 #include <Arduino.h>
-#include "../include.h"
 
+#include "../system_settings.h"
 #include "CanBattery.h"
 
 #ifdef RJXZS_BMS
diff --git a/Software/src/battery/RS485Battery.h b/Software/src/battery/RS485Battery.h
index 7d93753a..3154b9ff 100644
--- a/Software/src/battery/RS485Battery.h
+++ b/Software/src/battery/RS485Battery.h
@@ -13,7 +13,7 @@ class RS485Battery : public Battery, Transmitter, Rs485Receiver {
  public:
   virtual void transmit_rs485(unsigned long currentMillis) = 0;
 
-  String interface_name() { return "RS485"; }
+  const char* interface_name() { return "RS485"; }
 
   void transmit(unsigned long currentMillis) { transmit_rs485(currentMillis); }
 
diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
index aae467b3..7cad62fd 100644
--- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
+++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Credits go to maciek16c for these findings!
 https://github.com/maciek16c/hyundai-santa-fe-phev-battery
diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
index 7375a12c..834483a5 100644
--- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
+++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h
@@ -2,7 +2,6 @@
 #define SANTA_FE_PHEV_BATTERY_H
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef SANTA_FE_PHEV_BATTERY
diff --git a/Software/src/battery/SIMPBMS-BATTERY.cpp b/Software/src/battery/SIMPBMS-BATTERY.cpp
index 3d6e8379..b8b871c2 100644
--- a/Software/src/battery/SIMPBMS-BATTERY.cpp
+++ b/Software/src/battery/SIMPBMS-BATTERY.cpp
@@ -1,7 +1,6 @@
 #include "SIMPBMS-BATTERY.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void SimpBmsBattery::update_values() {
 
diff --git a/Software/src/battery/SIMPBMS-BATTERY.h b/Software/src/battery/SIMPBMS-BATTERY.h
index f4ac9691..85e19080 100644
--- a/Software/src/battery/SIMPBMS-BATTERY.h
+++ b/Software/src/battery/SIMPBMS-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef SIMPBMS_BATTERY_H
 #define SIMPBMS_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/SONO-BATTERY.cpp b/Software/src/battery/SONO-BATTERY.cpp
index 196fa891..c2243720 100644
--- a/Software/src/battery/SONO-BATTERY.cpp
+++ b/Software/src/battery/SONO-BATTERY.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void SonoBattery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for modbus
diff --git a/Software/src/battery/SONO-BATTERY.h b/Software/src/battery/SONO-BATTERY.h
index 4ad3f282..65d7e60b 100644
--- a/Software/src/battery/SONO-BATTERY.h
+++ b/Software/src/battery/SONO-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef SONO_BATTERY_H
 #define SONO_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 
diff --git a/Software/src/battery/Shunt.h b/Software/src/battery/Shunt.h
index 4a335e77..fb185041 100644
--- a/Software/src/battery/Shunt.h
+++ b/Software/src/battery/Shunt.h
@@ -1,9 +1,11 @@
 #ifndef _SHUNT_H
 #define _SHUNT_H
 
+#include "USER_SETTINGS.h"
 #include "src/communication/Transmitter.h"
 #include "src/communication/can/CanReceiver.h"
 #include "src/communication/can/comm_can.h"
+#include "src/devboard/safety/safety.h"
 #include "src/devboard/utils/types.h"
 
 enum class ShuntType { None = 0, BmwSbox = 1, Highest };
@@ -15,7 +17,7 @@ class CanShunt : public Transmitter, CanReceiver {
   virtual void handle_incoming_can_frame(CAN_frame rx_frame) = 0;
 
   // The name of the comm interface the shunt is using.
-  virtual String interface_name() { return getCANInterfaceName(can_config.shunt); }
+  virtual const char* interface_name() { return getCANInterfaceName(can_config.shunt); }
 
   void transmit(unsigned long currentMillis) {
     if (allowed_to_send_CAN) {
diff --git a/Software/src/battery/Shunts.cpp b/Software/src/battery/Shunts.cpp
index 1e0349b1..45578f2a 100644
--- a/Software/src/battery/Shunts.cpp
+++ b/Software/src/battery/Shunts.cpp
@@ -1,4 +1,4 @@
-#include "../include.h"
+#include "BMW-SBOX.h"
 #include "Shunt.h"
 
 CanShunt* shunt = nullptr;
diff --git a/Software/src/battery/TESLA-BATTERY.cpp b/Software/src/battery/TESLA-BATTERY.cpp
index c1db2aae..32599f93 100644
--- a/Software/src/battery/TESLA-BATTERY.cpp
+++ b/Software/src/battery/TESLA-BATTERY.cpp
@@ -3,7 +3,7 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For Advanced Battery Insights webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
+#include "../devboard/utils/logging.h"
 
 /* Credits: */
 /* Some of the original CAN frame parsing code below comes from Per Carlen's bms_comms_tesla_model3.py (https://gitlab.com/pelle8/batt2gen24/) */
diff --git a/Software/src/battery/TESLA-BATTERY.h b/Software/src/battery/TESLA-BATTERY.h
index 16282357..f3582594 100644
--- a/Software/src/battery/TESLA-BATTERY.h
+++ b/Software/src/battery/TESLA-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef TESLA_BATTERY_H
 #define TESLA_BATTERY_H
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "TESLA-HTML.h"
 
diff --git a/Software/src/battery/TEST-FAKE-BATTERY.cpp b/Software/src/battery/TEST-FAKE-BATTERY.cpp
index 8b5a26df..d2454991 100644
--- a/Software/src/battery/TEST-FAKE-BATTERY.cpp
+++ b/Software/src/battery/TEST-FAKE-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "TEST-FAKE-BATTERY.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
+#include "../devboard/utils/logging.h"
 
 static void print_units(const char* header, int value, const char* units) {
   logging.print(header);
diff --git a/Software/src/battery/TEST-FAKE-BATTERY.h b/Software/src/battery/TEST-FAKE-BATTERY.h
index b674d720..012a0363 100644
--- a/Software/src/battery/TEST-FAKE-BATTERY.h
+++ b/Software/src/battery/TEST-FAKE-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef TEST_FAKE_BATTERY_H
 #define TEST_FAKE_BATTERY_H
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef TEST_FAKE_BATTERY
diff --git a/Software/src/battery/VOLVO-SPA-BATTERY.cpp b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
index bb25f9ef..71352fdb 100644
--- a/Software/src/battery/VOLVO-SPA-BATTERY.cpp
+++ b/Software/src/battery/VOLVO-SPA-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void VolvoSpaBattery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for the inverter
diff --git a/Software/src/battery/VOLVO-SPA-BATTERY.h b/Software/src/battery/VOLVO-SPA-BATTERY.h
index 8fa6b1ea..be16549e 100644
--- a/Software/src/battery/VOLVO-SPA-BATTERY.h
+++ b/Software/src/battery/VOLVO-SPA-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef VOLVO_SPA_BATTERY_H
 #define VOLVO_SPA_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "VOLVO-SPA-HTML.h"
diff --git a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp
index 66e844c8..97e95859 100644
--- a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp
+++ b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp
@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void VolvoSpaHybridBattery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for the inverter
diff --git a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h
index e308f5d7..1aa4c4d0 100644
--- a/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h
+++ b/Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h
@@ -1,7 +1,6 @@
 #ifndef VOLVO_SPA_HYBRID_BATTERY_H
 #define VOLVO_SPA_HYBRID_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "VOLVO-SPA-HYBRID-HTML.h"
diff --git a/Software/src/charger/CHARGERS.cpp b/Software/src/charger/CHARGERS.cpp
index 6ba343b9..2ab85110 100644
--- a/Software/src/charger/CHARGERS.cpp
+++ b/Software/src/charger/CHARGERS.cpp
@@ -1,4 +1,6 @@
-#include "../include.h"
+#include "CHARGERS.h"
+#include <vector>
+#include "CanCharger.h"
 
 CanCharger* charger = nullptr;
 
diff --git a/Software/src/charger/CHEVY-VOLT-CHARGER.cpp b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
index fd026419..f00cb245 100644
--- a/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
+++ b/Software/src/charger/CHEVY-VOLT-CHARGER.cpp
@@ -1,7 +1,6 @@
 #include "CHEVY-VOLT-CHARGER.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* This implements Chevy Volt / Ampera charger support (2011-2015 model years).
  *
diff --git a/Software/src/charger/CHEVY-VOLT-CHARGER.h b/Software/src/charger/CHEVY-VOLT-CHARGER.h
index 7293d643..aedc40c3 100644
--- a/Software/src/charger/CHEVY-VOLT-CHARGER.h
+++ b/Software/src/charger/CHEVY-VOLT-CHARGER.h
@@ -2,7 +2,6 @@
 #define CHEVYVOLT_CHARGER_H
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanCharger.h"
 
 #ifdef CHEVYVOLT_CHARGER
diff --git a/Software/src/charger/CanCharger.h b/Software/src/charger/CanCharger.h
index e99dc7d5..13f94f30 100644
--- a/Software/src/charger/CanCharger.h
+++ b/Software/src/charger/CanCharger.h
@@ -6,6 +6,8 @@
 #include "../datalayer/datalayer.h"
 #include "src/communication/Transmitter.h"
 #include "src/communication/can/CanReceiver.h"
+#include "src/communication/can/comm_can.h"
+#include "src/devboard/safety/safety.h"
 
 enum class ChargerType { None, NissanLeaf, ChevyVolt, Highest };
 
diff --git a/Software/src/charger/NISSAN-LEAF-CHARGER.cpp b/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
index 4e22db90..fa502c07 100644
--- a/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
+++ b/Software/src/charger/NISSAN-LEAF-CHARGER.cpp
@@ -1,7 +1,6 @@
 #include "NISSAN-LEAF-CHARGER.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* This implements Nissan LEAF PDM charger support. 2013-2024 Gen2/3 PDMs are supported
  *
diff --git a/Software/src/charger/NISSAN-LEAF-CHARGER.h b/Software/src/charger/NISSAN-LEAF-CHARGER.h
index 7d2aa98f..0971b333 100644
--- a/Software/src/charger/NISSAN-LEAF-CHARGER.h
+++ b/Software/src/charger/NISSAN-LEAF-CHARGER.h
@@ -1,7 +1,6 @@
 #ifndef NISSANLEAF_CHARGER_H
 #define NISSANLEAF_CHARGER_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanCharger.h"
 
diff --git a/Software/src/communication/can/comm_can.cpp b/Software/src/communication/can/comm_can.cpp
index dddb24fc..352bdb5e 100644
--- a/Software/src/communication/can/comm_can.cpp
+++ b/Software/src/communication/can/comm_can.cpp
@@ -1,11 +1,14 @@
 #include "comm_can.h"
 #include <algorithm>
 #include <map>
-#include "../../include.h"
 #include "../../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 #include "../../lib/pierremolinaro-ACAN2517FD/ACAN2517FD.h"
 #include "../../lib/pierremolinaro-acan2515/ACAN2515.h"
+#include "CanReceiver.h"
+#include "USER_SETTINGS.h"
 #include "comm_can.h"
+#include "src/datalayer/datalayer.h"
+#include "src/devboard/safety/safety.h"
 #include "src/devboard/sdcard/sdcard.h"
 #include "src/devboard/utils/logging.h"
 
diff --git a/Software/src/communication/can/obd.cpp b/Software/src/communication/can/obd.cpp
index c0404b3d..c01d9b24 100644
--- a/Software/src/communication/can/obd.cpp
+++ b/Software/src/communication/can/obd.cpp
@@ -1,4 +1,5 @@
 #include "obd.h"
+#include "../../devboard/utils/logging.h"
 #include "comm_can.h"
 
 void show_dtc(uint8_t byte0, uint8_t byte1);
diff --git a/Software/src/communication/can/obd.h b/Software/src/communication/can/obd.h
index df2fc558..96958d90 100644
--- a/Software/src/communication/can/obd.h
+++ b/Software/src/communication/can/obd.h
@@ -1,8 +1,8 @@
 #ifndef _OBD_H_
 #define _OBD_H_
 
-#include "../../include.h"
 #include "../../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
+#include "comm_can.h"
 
 void handle_obd_frame(CAN_frame& rx_frame);
 
diff --git a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
index 1b414f2b..d0e62216 100644
--- a/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
+++ b/Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp
@@ -1,5 +1,7 @@
 #include "comm_contactorcontrol.h"
-#include "../../include.h"
+#include "../../devboard/hal/hal.h"
+#include "../../devboard/safety/safety.h"
+#include "../../inverter/INVERTERS.h"
 
 #ifdef CONTACTOR_CONTROL
 const bool contactor_control_enabled_default = true;
diff --git a/Software/src/communication/contactorcontrol/comm_contactorcontrol.h b/Software/src/communication/contactorcontrol/comm_contactorcontrol.h
index b06a4770..45551610 100644
--- a/Software/src/communication/contactorcontrol/comm_contactorcontrol.h
+++ b/Software/src/communication/contactorcontrol/comm_contactorcontrol.h
@@ -1,8 +1,6 @@
 #ifndef _COMM_CONTACTORCONTROL_H_
 #define _COMM_CONTACTORCONTROL_H_
 
-#include "../../include.h"
-
 #include "../../datalayer/datalayer.h"
 #include "../../devboard/utils/events.h"
 
diff --git a/Software/src/communication/equipmentstopbutton/comm_equipmentstopbutton.cpp b/Software/src/communication/equipmentstopbutton/comm_equipmentstopbutton.cpp
index 9a402f75..60a17b54 100644
--- a/Software/src/communication/equipmentstopbutton/comm_equipmentstopbutton.cpp
+++ b/Software/src/communication/equipmentstopbutton/comm_equipmentstopbutton.cpp
@@ -1,5 +1,7 @@
 #include "comm_equipmentstopbutton.h"
-#include "../../include.h"
+#include "../../devboard/hal/hal.h"
+#include "../../devboard/safety/safety.h"
+#include "USER_SETTINGS.h"
 
 STOP_BUTTON_BEHAVIOR equipment_stop_behavior = stop_button_default_behavior;
 
diff --git a/Software/src/communication/nvm/comm_nvm.cpp b/Software/src/communication/nvm/comm_nvm.cpp
index d2adb904..8fbe85a9 100644
--- a/Software/src/communication/nvm/comm_nvm.cpp
+++ b/Software/src/communication/nvm/comm_nvm.cpp
@@ -1,8 +1,11 @@
 #include "comm_nvm.h"
+#include "../../battery/Battery.h"
+#include "../../battery/Shunt.h"
+#include "../../charger/CanCharger.h"
 #include "../../communication/can/comm_can.h"
 #include "../../devboard/mqtt/mqtt.h"
 #include "../../devboard/wifi/wifi.h"
-#include "../../include.h"
+#include "../../inverter/INVERTERS.h"
 #include "../contactorcontrol/comm_contactorcontrol.h"
 
 // Parameters
diff --git a/Software/src/communication/nvm/comm_nvm.h b/Software/src/communication/nvm/comm_nvm.h
index 6d47d13d..846c1014 100644
--- a/Software/src/communication/nvm/comm_nvm.h
+++ b/Software/src/communication/nvm/comm_nvm.h
@@ -1,8 +1,7 @@
 #ifndef _COMM_NVM_H_
 #define _COMM_NVM_H_
 
-#include "../../include.h"
-
+#include <Preferences.h>
 #include <limits>
 #include "../../datalayer/datalayer.h"
 #include "../../devboard/utils/events.h"
diff --git a/Software/src/communication/precharge_control/precharge_control.cpp b/Software/src/communication/precharge_control/precharge_control.cpp
index 6498ae4d..52672c92 100644
--- a/Software/src/communication/precharge_control/precharge_control.cpp
+++ b/Software/src/communication/precharge_control/precharge_control.cpp
@@ -1,7 +1,7 @@
 #include "precharge_control.h"
 #include "../../datalayer/datalayer.h"
 #include "../../datalayer/datalayer_extended.h"
-#include "../../include.h"
+#include "../../devboard/hal/hal.h"
 
 #ifdef PRECHARGE_CONTROL
 const bool precharge_control_enabled_default = true;
diff --git a/Software/src/communication/precharge_control/precharge_control.h b/Software/src/communication/precharge_control/precharge_control.h
index 5270fe8c..0262ebd7 100644
--- a/Software/src/communication/precharge_control/precharge_control.h
+++ b/Software/src/communication/precharge_control/precharge_control.h
@@ -1,8 +1,6 @@
 #ifndef _PRECHARGE_CONTROL_H_
 #define _PRECHARGE_CONTROL_H_
 
-#include "../../include.h"
-
 #include "../../devboard/utils/events.h"
 
 /**
diff --git a/Software/src/communication/rs485/comm_rs485.cpp b/Software/src/communication/rs485/comm_rs485.cpp
index 807eb7c3..926f9d5d 100644
--- a/Software/src/communication/rs485/comm_rs485.cpp
+++ b/Software/src/communication/rs485/comm_rs485.cpp
@@ -1,6 +1,7 @@
 #include "comm_rs485.h"
-#include "../../include.h"
+#include "../../devboard/hal/hal.h"
 
+#include <Arduino.h>
 #include <list>
 
 bool init_rs485() {
diff --git a/Software/src/datalayer/datalayer.cpp b/Software/src/datalayer/datalayer.cpp
index 2457b171..d162b97f 100644
--- a/Software/src/datalayer/datalayer.cpp
+++ b/Software/src/datalayer/datalayer.cpp
@@ -1,4 +1,3 @@
 #include "datalayer.h"
-#include "../include.h"
 
 DataLayer datalayer;
diff --git a/Software/src/datalayer/datalayer_extended.cpp b/Software/src/datalayer/datalayer_extended.cpp
index 81591f28..daf358d0 100644
--- a/Software/src/datalayer/datalayer_extended.cpp
+++ b/Software/src/datalayer/datalayer_extended.cpp
@@ -1,4 +1,3 @@
 #include "datalayer_extended.h"
-#include "../include.h"
 
 DataLayerExtended datalayer_extended;
diff --git a/Software/src/devboard/mqtt/mqtt.cpp b/Software/src/devboard/mqtt/mqtt.cpp
index f1043941..4a814230 100644
--- a/Software/src/devboard/mqtt/mqtt.cpp
+++ b/Software/src/devboard/mqtt/mqtt.cpp
@@ -12,6 +12,7 @@
 #include "../../lib/bblanchon-ArduinoJson/ArduinoJson.h"
 #include "../utils/events.h"
 #include "../utils/timer.h"
+#include "mqtt.h"
 #include "mqtt_client.h"
 
 #ifdef MQTT
diff --git a/Software/src/devboard/mqtt/mqtt.h b/Software/src/devboard/mqtt/mqtt.h
index f28684c8..46261d5b 100644
--- a/Software/src/devboard/mqtt/mqtt.h
+++ b/Software/src/devboard/mqtt/mqtt.h
@@ -35,8 +35,8 @@
 #define __MQTT_H__
 
 #include <Arduino.h>
+#include <string>
 #include <vector>
-#include "../../include.h"
 
 #define MQTT_MSG_BUFFER_SIZE (1024)
 
diff --git a/Software/src/devboard/safety/safety.cpp b/Software/src/devboard/safety/safety.cpp
index 3fd19aa7..ea98e94c 100644
--- a/Software/src/devboard/safety/safety.cpp
+++ b/Software/src/devboard/safety/safety.cpp
@@ -1,6 +1,8 @@
 #include "safety.h"
+#include "../../battery/BATTERIES.h"
+#include "../../charger/CHARGERS.h"
 #include "../../datalayer/datalayer.h"
-#include "../../include.h"
+#include "../../inverter/INVERTERS.h"
 #include "../utils/events.h"
 
 static uint16_t cell_deviation_mV = 0;
diff --git a/Software/src/devboard/sdcard/sdcard.cpp b/Software/src/devboard/sdcard/sdcard.cpp
index 47f5f142..078b6301 100644
--- a/Software/src/devboard/sdcard/sdcard.cpp
+++ b/Software/src/devboard/sdcard/sdcard.cpp
@@ -1,5 +1,4 @@
 #include "sdcard.h"
-#include "../../include.h"
 #include "freertos/ringbuf.h"
 
 File can_log_file;
diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp
index d7ddfbc0..32f99cec 100644
--- a/Software/src/devboard/utils/events.cpp
+++ b/Software/src/devboard/utils/events.cpp
@@ -1,8 +1,8 @@
 #include "events.h"
-#include "../../datalayer/datalayer.h"
-#include "../../include.h"
-
 #include "../../../USER_SETTINGS.h"
+#include "../../datalayer/datalayer.h"
+#include "../../devboard/hal/hal.h"
+#include "../../devboard/utils/logging.h"
 
 typedef struct {
   EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS];
diff --git a/Software/src/devboard/utils/led_handler.cpp b/Software/src/devboard/utils/led_handler.cpp
index a4588ff3..9c217a3d 100644
--- a/Software/src/devboard/utils/led_handler.cpp
+++ b/Software/src/devboard/utils/led_handler.cpp
@@ -1,6 +1,6 @@
 #include "led_handler.h"
 #include "../../datalayer/datalayer.h"
-#include "../../include.h"
+#include "../../devboard/hal/hal.h"
 #include "events.h"
 #include "value_mapping.h"
 
@@ -28,9 +28,11 @@ bool led_init(void) {
 
   return true;
 }
+
 void led_exe(void) {
   led->exe();
 }
+
 led_color led_get_color() {
   return led->color;
 }
diff --git a/Software/src/devboard/utils/led_handler.h b/Software/src/devboard/utils/led_handler.h
index 15a91c02..60c18d8c 100644
--- a/Software/src/devboard/utils/led_handler.h
+++ b/Software/src/devboard/utils/led_handler.h
@@ -1,7 +1,7 @@
 #ifndef LED_H_
 #define LED_H_
 
-#include "../../include.h"
+#include "../../devboard/utils/types.h"
 #include "../../lib/adafruit-Adafruit_NeoPixel/Adafruit_NeoPixel.h"
 
 class LED {
diff --git a/Software/src/devboard/utils/logging.cpp b/Software/src/devboard/utils/logging.cpp
index c6811697..93a2586a 100644
--- a/Software/src/devboard/utils/logging.cpp
+++ b/Software/src/devboard/utils/logging.cpp
@@ -1,7 +1,14 @@
 #include "logging.h"
+#include "../../../USER_SETTINGS.h"
 #include "../../datalayer/datalayer.h"
 #include "../sdcard/sdcard.h"
 
+#if defined(LOG_CAN_TO_SD) || defined(LOG_TO_SD)
+#if !defined(HW_LILYGO)
+#error The SD card logging feature is only available on LilyGo hardware
+#endif
+#endif
+
 #define MAX_LINE_LENGTH_PRINTF 128
 #define MAX_LENGTH_TIME_STR 14
 
diff --git a/Software/src/devboard/utils/logging.h b/Software/src/devboard/utils/logging.h
index 99ef4c31..dcc53340 100644
--- a/Software/src/devboard/utils/logging.h
+++ b/Software/src/devboard/utils/logging.h
@@ -23,7 +23,7 @@ extern Logging logging;
 #define DEBUG_PRINTLN(str) logging.println(str)
 #else
 #define DEBUG_PRINTF(fmt, ...) ((void)0)
-#define DEBUG_PRINTLN(fmt, ...) ((void)0)
+#define DEBUG_PRINTLN(str) ((void)0)
 #endif
 
 #endif  // __LOGGING_H__
diff --git a/Software/src/devboard/utils/ntp_time.cpp b/Software/src/devboard/utils/ntp_time.cpp
index 5c7de035..5221a36a 100644
--- a/Software/src/devboard/utils/ntp_time.cpp
+++ b/Software/src/devboard/utils/ntp_time.cpp
@@ -1,5 +1,6 @@
 #include "ntp_time.h"
-#include "../../include.h"
+#include <Arduino.h>
+#include "../../devboard/utils/logging.h"
 #include "time.h"
 
 const unsigned long millisInADay = 24 * 60 * 60 * 1000;  // 24 hours in milliseconds
diff --git a/Software/src/devboard/utils/time_meas.h b/Software/src/devboard/utils/time_meas.h
index d629758a..30f1e5eb 100644
--- a/Software/src/devboard/utils/time_meas.h
+++ b/Software/src/devboard/utils/time_meas.h
@@ -1,6 +1,7 @@
 #ifndef TIME_MEAS_H_
 #define TIME_MEAS_H_
 
+#include "USER_SETTINGS.h"
 #include "esp_timer.h"
 
 /** Start time measurement in microseconds
diff --git a/Software/src/devboard/utils/value_mapping.h b/Software/src/devboard/utils/value_mapping.h
index baedbeb0..15bf03af 100644
--- a/Software/src/devboard/utils/value_mapping.h
+++ b/Software/src/devboard/utils/value_mapping.h
@@ -1,8 +1,6 @@
 #ifndef __MAPPING_H__
 #define __MAPPING_H__
 
-#include "../../include.h"
-
 /** MIN macro, returns the smallest of two values
  * Warning: Side effects. MUST be called using values and/or variables only, e.g.:
  * int x = MIN(temp1, temp2);
diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp
index 911ea166..f52ff189 100644
--- a/Software/src/devboard/webserver/advanced_battery_html.cpp
+++ b/Software/src/devboard/webserver/advanced_battery_html.cpp
@@ -1,9 +1,9 @@
 #include "advanced_battery_html.h"
 #include <Arduino.h>
 #include <vector>
+#include "../../battery/BATTERIES.h"
 #include "../../datalayer/datalayer.h"
 #include "../../datalayer/datalayer_extended.h"
-#include "../../include.h"
 
 // Available generic battery commands that are taken into use based on what the selected battery supports.
 std::vector<BatteryCommand> battery_commands = {
diff --git a/Software/src/devboard/webserver/cellmonitor_html.cpp b/Software/src/devboard/webserver/cellmonitor_html.cpp
index d3e95e78..0555f134 100644
--- a/Software/src/devboard/webserver/cellmonitor_html.cpp
+++ b/Software/src/devboard/webserver/cellmonitor_html.cpp
@@ -1,5 +1,6 @@
 #include "cellmonitor_html.h"
 #include <Arduino.h>
+#include "../../battery/BATTERIES.h"
 #include "../../datalayer/datalayer.h"
 
 String cellmonitor_processor(const String& var) {
diff --git a/Software/src/devboard/webserver/cellmonitor_html.h b/Software/src/devboard/webserver/cellmonitor_html.h
index 44015408..88727a09 100644
--- a/Software/src/devboard/webserver/cellmonitor_html.h
+++ b/Software/src/devboard/webserver/cellmonitor_html.h
@@ -1,7 +1,7 @@
 #ifndef CELLMONITOR_H
 #define CELLMONITOR_H
 
-#include "../../include.h"
+#include <WString.h>
 
 /**
  * @brief Replaces placeholder with content section in web page
diff --git a/Software/src/devboard/webserver/settings_html.cpp b/Software/src/devboard/webserver/settings_html.cpp
index ed562679..9343c6a5 100644
--- a/Software/src/devboard/webserver/settings_html.cpp
+++ b/Software/src/devboard/webserver/settings_html.cpp
@@ -5,8 +5,9 @@
 #include "../../communication/can/comm_can.h"
 #include "../../communication/nvm/comm_nvm.h"
 #include "../../datalayer/datalayer.h"
-#include "../../include.h"
 #include "index_html.h"
+#include "src/battery/BATTERIES.h"
+#include "src/inverter/INVERTERS.h"
 
 extern bool settingsUpdated;
 
diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp
index ea8098a2..0291ce71 100644
--- a/Software/src/devboard/webserver/webserver.cpp
+++ b/Software/src/devboard/webserver/webserver.cpp
@@ -5,11 +5,13 @@
 #include "../../../USER_SECRETS.h"
 #include "../../battery/BATTERIES.h"
 #include "../../battery/Battery.h"
+#include "../../charger/CHARGERS.h"
 #include "../../communication/can/comm_can.h"
 #include "../../communication/contactorcontrol/comm_contactorcontrol.h"
 #include "../../communication/nvm/comm_nvm.h"
 #include "../../datalayer/datalayer.h"
 #include "../../datalayer/datalayer_extended.h"
+#include "../../inverter/INVERTERS.h"
 #include "../../lib/bblanchon-ArduinoJson/ArduinoJson.h"
 #include "../sdcard/sdcard.h"
 #include "../utils/events.h"
diff --git a/Software/src/devboard/webserver/webserver.h b/Software/src/devboard/webserver/webserver.h
index 71eacc2b..87f3fd26 100644
--- a/Software/src/devboard/webserver/webserver.h
+++ b/Software/src/devboard/webserver/webserver.h
@@ -3,7 +3,6 @@
 
 #include <Preferences.h>
 #include <WiFi.h>
-#include "../../include.h"
 #include "../../lib/ESP32Async-ESPAsyncWebServer/src/ESPAsyncWebServer.h"
 #include "../../lib/YiannisBourkelis-Uptime-Library/src/uptime_formatter.h"
 #include "../../lib/ayushsharma82-ElegantOTA/src/ElegantOTA.h"
diff --git a/Software/src/devboard/wifi/wifi.cpp b/Software/src/devboard/wifi/wifi.cpp
index 545a6ed3..27b52a67 100644
--- a/Software/src/devboard/wifi/wifi.cpp
+++ b/Software/src/devboard/wifi/wifi.cpp
@@ -1,7 +1,7 @@
 #include "wifi.h"
 #include <ESPmDNS.h>
-#include "../../include.h"
 #include "../utils/events.h"
+#include "../utils/logging.h"
 
 #if defined(WIFI) || defined(WEBSERVER)
 const bool wifi_enabled_default = true;
diff --git a/Software/src/devboard/wifi/wifi.h b/Software/src/devboard/wifi/wifi.h
index a75ac703..6e0b7b50 100644
--- a/Software/src/devboard/wifi/wifi.h
+++ b/Software/src/devboard/wifi/wifi.h
@@ -3,7 +3,6 @@
 
 #include <WiFi.h>
 #include <string>
-#include "../../include.h"
 
 extern std::string ssid;
 extern std::string password;
diff --git a/Software/src/include.h b/Software/src/include.h
deleted file mode 100644
index 8c849293..00000000
--- a/Software/src/include.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef INCLUDE_H_
-#define INCLUDE_H_
-
-#include <Arduino.h>
-#include <Preferences.h>
-#include <stdint.h>
-#include "../USER_SETTINGS.h"
-#include "system_settings.h"
-
-#include "devboard/hal/hal.h"
-#include "devboard/safety/safety.h"
-#include "devboard/utils/logging.h"
-#include "devboard/utils/time_meas.h"
-#include "devboard/utils/types.h"
-
-#include "battery/BATTERIES.h"
-#include "charger/CHARGERS.h"
-#include "inverter/INVERTERS.h"
-
-/* - ERROR CHECKS BELOW, DON'T TOUCH - */
-
-#if !defined(HW_LILYGO) && !defined(HW_STARK) && !defined(HW_3LB) && !defined(HW_DEVKIT)
-#error You must select a target hardware in the USER_SETTINGS.h file!
-#endif
-
-#ifdef HW_LILYGO
-#if defined(PERIODIC_BMS_RESET) || defined(REMOTE_BMS_RESET)
-#if defined(CAN_ADDON) || defined(CANFD_ADDON) || defined(CHADEMO_BATTERY)
-//Check that BMS reset is not used at the same time as Chademo and CAN addons
-#error BMS RESET CANNOT BE USED AT SAME TIME AS CAN-ADDONS / CHADMEO! NOT ENOUGH GPIO!
-#endif
-#endif
-#endif
-
-#if defined(LOG_CAN_TO_SD) || defined(LOG_TO_SD)
-#if !defined(HW_LILYGO)
-#error The SD card logging feature is only available on LilyGo hardware
-#endif
-#endif
-
-#endif
diff --git a/Software/src/inverter/AFORE-CAN.cpp b/Software/src/inverter/AFORE-CAN.cpp
index 361e1bb6..a195e4ab 100644
--- a/Software/src/inverter/AFORE-CAN.cpp
+++ b/Software/src/inverter/AFORE-CAN.cpp
@@ -1,7 +1,6 @@
 #include "AFORE-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 #define SOCMAX 100
 #define SOCMIN 1
diff --git a/Software/src/inverter/AFORE-CAN.h b/Software/src/inverter/AFORE-CAN.h
index cf0768fa..f98a582a 100644
--- a/Software/src/inverter/AFORE-CAN.h
+++ b/Software/src/inverter/AFORE-CAN.h
@@ -1,6 +1,5 @@
 #ifndef AFORE_CAN_H
 #define AFORE_CAN_H
-#include "../include.h"
 
 #ifdef AFORE_CAN
 #define SELECTED_INVERTER_CLASS AforeCanInverter
diff --git a/Software/src/inverter/BYD-CAN.cpp b/Software/src/inverter/BYD-CAN.cpp
index 85e18959..0e9687b2 100644
--- a/Software/src/inverter/BYD-CAN.cpp
+++ b/Software/src/inverter/BYD-CAN.cpp
@@ -1,7 +1,6 @@
 #include "BYD-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* Do not change code below unless you are sure what you are doing */
 
diff --git a/Software/src/inverter/BYD-CAN.h b/Software/src/inverter/BYD-CAN.h
index 0668b15d..41f7f644 100644
--- a/Software/src/inverter/BYD-CAN.h
+++ b/Software/src/inverter/BYD-CAN.h
@@ -1,11 +1,11 @@
 #ifndef BYD_CAN_H
 #define BYD_CAN_H
-#include "../include.h"
 
 #ifdef BYD_CAN
 #define SELECTED_INVERTER_CLASS BydCanInverter
 #endif
 
+#include "../../USER_SETTINGS.h"
 #include "CanInverterProtocol.h"
 
 class BydCanInverter : public CanInverterProtocol {
diff --git a/Software/src/inverter/BYD-MODBUS.cpp b/Software/src/inverter/BYD-MODBUS.cpp
index 89625560..b8c15922 100644
--- a/Software/src/inverter/BYD-MODBUS.cpp
+++ b/Software/src/inverter/BYD-MODBUS.cpp
@@ -1,7 +1,7 @@
 #include "BYD-MODBUS.h"
 #include "../datalayer/datalayer.h"
+#include "../devboard/hal/hal.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 #include "../lib/eModbus-eModbus/scripts/mbServerFCs.h"
 
 // For modbus register definitions, see https://gitlab.com/pelle8/inverter_resources/-/blob/main/byd_registers_modbus_rtu.md
diff --git a/Software/src/inverter/BYD-MODBUS.h b/Software/src/inverter/BYD-MODBUS.h
index 3bcf378e..e9559e51 100644
--- a/Software/src/inverter/BYD-MODBUS.h
+++ b/Software/src/inverter/BYD-MODBUS.h
@@ -1,6 +1,5 @@
 #ifndef BYD_MODBUS_H
 #define BYD_MODBUS_H
-#include "../include.h"
 
 #ifdef BYD_MODBUS
 #define SELECTED_INVERTER_CLASS BydModbusInverter
diff --git a/Software/src/inverter/CanInverterProtocol.h b/Software/src/inverter/CanInverterProtocol.h
index d86cb5ec..0a47488f 100644
--- a/Software/src/inverter/CanInverterProtocol.h
+++ b/Software/src/inverter/CanInverterProtocol.h
@@ -2,9 +2,12 @@
 #define CANINVERTER_PROTOCOL_H
 
 #include "InverterProtocol.h"
+#include "USER_SETTINGS.h"
 
+#include "src/communication/Transmitter.h"
 #include "src/communication/can/CanReceiver.h"
 #include "src/communication/can/comm_can.h"
+#include "src/devboard/safety/safety.h"
 #include "src/devboard/utils/types.h"
 
 class CanInverterProtocol : public InverterProtocol, Transmitter, CanReceiver {
diff --git a/Software/src/inverter/FERROAMP-CAN.cpp b/Software/src/inverter/FERROAMP-CAN.cpp
index ee6e71ee..0ecdf69e 100644
--- a/Software/src/inverter/FERROAMP-CAN.cpp
+++ b/Software/src/inverter/FERROAMP-CAN.cpp
@@ -1,7 +1,6 @@
 #include "FERROAMP-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 //#define SEND_0  //If defined, the messages will have ID ending with 0 (useful for some inverters)
 #define SEND_1                 //If defined, the messages will have ID ending with 1 (useful for some inverters)
diff --git a/Software/src/inverter/FERROAMP-CAN.h b/Software/src/inverter/FERROAMP-CAN.h
index e5b5cd3c..f45dabc4 100644
--- a/Software/src/inverter/FERROAMP-CAN.h
+++ b/Software/src/inverter/FERROAMP-CAN.h
@@ -1,6 +1,5 @@
 #ifndef FERROAMP_CAN_H
 #define FERROAMP_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/FOXESS-CAN.cpp b/Software/src/inverter/FOXESS-CAN.cpp
index 846c6800..f9b4c5ce 100644
--- a/Software/src/inverter/FOXESS-CAN.cpp
+++ b/Software/src/inverter/FOXESS-CAN.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Based on info from this excellent repo: https://github.com/FozzieUK/FoxESS-Canbus-Protocol */
 /* The FoxESS protocol emulates the stackable (1-8) 48V towers found in the HV2600 / ECS4100 batteries
diff --git a/Software/src/inverter/FOXESS-CAN.h b/Software/src/inverter/FOXESS-CAN.h
index 9f7e9c04..2bb82df4 100644
--- a/Software/src/inverter/FOXESS-CAN.h
+++ b/Software/src/inverter/FOXESS-CAN.h
@@ -1,6 +1,5 @@
 #ifndef FOXESS_CAN_H
 #define FOXESS_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/GROWATT-HV-CAN.cpp b/Software/src/inverter/GROWATT-HV-CAN.cpp
index d7ed65b2..0a4ab2e5 100644
--- a/Software/src/inverter/GROWATT-HV-CAN.cpp
+++ b/Software/src/inverter/GROWATT-HV-CAN.cpp
@@ -1,7 +1,6 @@
 #include "GROWATT-HV-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* TODO:
 This protocol has not been tested with any inverter. Proceed with extreme caution.
diff --git a/Software/src/inverter/GROWATT-HV-CAN.h b/Software/src/inverter/GROWATT-HV-CAN.h
index 5b0e0355..cf9d1b9a 100644
--- a/Software/src/inverter/GROWATT-HV-CAN.h
+++ b/Software/src/inverter/GROWATT-HV-CAN.h
@@ -1,6 +1,5 @@
 #ifndef GROWATT_HV_CAN_H
 #define GROWATT_HV_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/GROWATT-LV-CAN.cpp b/Software/src/inverter/GROWATT-LV-CAN.cpp
index 36b34690..60899840 100644
--- a/Software/src/inverter/GROWATT-LV-CAN.cpp
+++ b/Software/src/inverter/GROWATT-LV-CAN.cpp
@@ -1,7 +1,6 @@
 #include "GROWATT-LV-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* Growatt BMS CAN-Bus-protocol Low Voltage Rev_04
 CAN 2.0A
diff --git a/Software/src/inverter/GROWATT-LV-CAN.h b/Software/src/inverter/GROWATT-LV-CAN.h
index 1d9877b7..ae6c71b2 100644
--- a/Software/src/inverter/GROWATT-LV-CAN.h
+++ b/Software/src/inverter/GROWATT-LV-CAN.h
@@ -1,6 +1,5 @@
 #ifndef GROWATT_LV_CAN_H
 #define GROWATT_LV_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/INVERTERS.cpp b/Software/src/inverter/INVERTERS.cpp
index 3019d0b0..b7dc9ac2 100644
--- a/Software/src/inverter/INVERTERS.cpp
+++ b/Software/src/inverter/INVERTERS.cpp
@@ -1,4 +1,4 @@
-#include "../include.h"
+#include "INVERTERS.h"
 
 InverterProtocol* inverter = nullptr;
 
diff --git a/Software/src/inverter/InverterProtocol.h b/Software/src/inverter/InverterProtocol.h
index 8620eff1..11761192 100644
--- a/Software/src/inverter/InverterProtocol.h
+++ b/Software/src/inverter/InverterProtocol.h
@@ -1,6 +1,8 @@
 #ifndef INVERTER_PROTOCOL_H
 #define INVERTER_PROTOCOL_H
 
+#include <vector>
+
 enum class InverterProtocolType {
   None = 0,
   AforeCan,
diff --git a/Software/src/inverter/KOSTAL-RS485.cpp b/Software/src/inverter/KOSTAL-RS485.cpp
index e1f3829f..518ba4cf 100644
--- a/Software/src/inverter/KOSTAL-RS485.cpp
+++ b/Software/src/inverter/KOSTAL-RS485.cpp
@@ -1,7 +1,8 @@
 #include "KOSTAL-RS485.h"
+#include "../battery/BATTERIES.h"
 #include "../datalayer/datalayer.h"
+#include "../devboard/hal/hal.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void KostalInverterProtocol::float2frame(byte* arr, float value, byte framepointer) {
   f32b g;
diff --git a/Software/src/inverter/KOSTAL-RS485.h b/Software/src/inverter/KOSTAL-RS485.h
index e953656b..01a5cf35 100644
--- a/Software/src/inverter/KOSTAL-RS485.h
+++ b/Software/src/inverter/KOSTAL-RS485.h
@@ -1,7 +1,6 @@
 #ifndef BYD_KOSTAL_RS485_H
 #define BYD_KOSTAL_RS485_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "Rs485InverterProtocol.h"
 
diff --git a/Software/src/inverter/PYLON-CAN.cpp b/Software/src/inverter/PYLON-CAN.cpp
index b954887d..293e53cf 100644
--- a/Software/src/inverter/PYLON-CAN.cpp
+++ b/Software/src/inverter/PYLON-CAN.cpp
@@ -1,7 +1,6 @@
 #include "PYLON-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 #define SEND_0  //If defined, the messages will have ID ending with 0 (useful for some inverters)
 //#define SEND_1 //If defined, the messages will have ID ending with 1 (useful for some inverters)
diff --git a/Software/src/inverter/PYLON-CAN.h b/Software/src/inverter/PYLON-CAN.h
index cc47f143..5c55b039 100644
--- a/Software/src/inverter/PYLON-CAN.h
+++ b/Software/src/inverter/PYLON-CAN.h
@@ -1,6 +1,5 @@
 #ifndef PYLON_CAN_H
 #define PYLON_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/PYLON-LV-CAN.cpp b/Software/src/inverter/PYLON-LV-CAN.cpp
index 5d22626a..7028f558 100644
--- a/Software/src/inverter/PYLON-LV-CAN.cpp
+++ b/Software/src/inverter/PYLON-LV-CAN.cpp
@@ -1,7 +1,6 @@
 #include "PYLON-LV-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 // when e.g. the min temperature is 0, max is 100 and the warning percent is 80%
 // a warning should be generated at 20 (i.e. at 20% of the value range)
diff --git a/Software/src/inverter/PYLON-LV-CAN.h b/Software/src/inverter/PYLON-LV-CAN.h
index 41a8baad..24800621 100644
--- a/Software/src/inverter/PYLON-LV-CAN.h
+++ b/Software/src/inverter/PYLON-LV-CAN.h
@@ -1,6 +1,5 @@
 #ifndef PYLON_LV_CAN_H
 #define PYLON_LV_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/SCHNEIDER-CAN.cpp b/Software/src/inverter/SCHNEIDER-CAN.cpp
index 509b9ff9..31c302ce 100644
--- a/Software/src/inverter/SCHNEIDER-CAN.cpp
+++ b/Software/src/inverter/SCHNEIDER-CAN.cpp
@@ -1,7 +1,6 @@
 #include "SCHNEIDER-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* Version 2: SE BMS Communication Protocol 
 Protocol: CAN 2.0 Specification
diff --git a/Software/src/inverter/SCHNEIDER-CAN.h b/Software/src/inverter/SCHNEIDER-CAN.h
index 7c986463..e895e939 100644
--- a/Software/src/inverter/SCHNEIDER-CAN.h
+++ b/Software/src/inverter/SCHNEIDER-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SCHNEIDER_CAN_H
 #define SCHNEIDER_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/SMA-BYD-H-CAN.cpp b/Software/src/inverter/SMA-BYD-H-CAN.cpp
index 6fd040c0..7a3ef790 100644
--- a/Software/src/inverter/SMA-BYD-H-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-H-CAN.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO: Map error bits in 0x158 */
 
diff --git a/Software/src/inverter/SMA-BYD-H-CAN.h b/Software/src/inverter/SMA-BYD-H-CAN.h
index ce234ba2..afb91274 100644
--- a/Software/src/inverter/SMA-BYD-H-CAN.h
+++ b/Software/src/inverter/SMA-BYD-H-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SMA_BYD_H_CAN_H
 #define SMA_BYD_H_CAN_H
-#include "../include.h"
 
 #include "SmaInverterBase.h"
 #include "src/devboard/hal/hal.h"
diff --git a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
index e3187f93..b5a14087 100644
--- a/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
+++ b/Software/src/inverter/SMA-BYD-HVS-CAN.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO: Map error bits in 0x158 */
 
diff --git a/Software/src/inverter/SMA-BYD-HVS-CAN.h b/Software/src/inverter/SMA-BYD-HVS-CAN.h
index aa70c915..c62ac8bf 100644
--- a/Software/src/inverter/SMA-BYD-HVS-CAN.h
+++ b/Software/src/inverter/SMA-BYD-HVS-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SMA_BYD_HVS_CAN_H
 #define SMA_BYD_HVS_CAN_H
-#include "../include.h"
 
 #include "SmaInverterBase.h"
 #include "src/devboard/hal/hal.h"
diff --git a/Software/src/inverter/SMA-LV-CAN.cpp b/Software/src/inverter/SMA-LV-CAN.cpp
index 38fd9bcf..84aae866 100644
--- a/Software/src/inverter/SMA-LV-CAN.cpp
+++ b/Software/src/inverter/SMA-LV-CAN.cpp
@@ -1,7 +1,6 @@
 #include "SMA-LV-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* SMA Sunny Island Low Voltage (48V) CAN protocol:
 CAN 2.0A
diff --git a/Software/src/inverter/SMA-LV-CAN.h b/Software/src/inverter/SMA-LV-CAN.h
index 3eb345ba..4ceef71b 100644
--- a/Software/src/inverter/SMA-LV-CAN.h
+++ b/Software/src/inverter/SMA-LV-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SMA_LV_CAN_H
 #define SMA_LV_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
index 272b6864..331c0f63 100644
--- a/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
+++ b/Software/src/inverter/SMA-TRIPOWER-CAN.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO:
 - Figure out the manufacturer info needed in transmit_can_init() CAN messages
diff --git a/Software/src/inverter/SMA-TRIPOWER-CAN.h b/Software/src/inverter/SMA-TRIPOWER-CAN.h
index d850f9fd..9611ba53 100644
--- a/Software/src/inverter/SMA-TRIPOWER-CAN.h
+++ b/Software/src/inverter/SMA-TRIPOWER-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SMA_CAN_TRIPOWER_H
 #define SMA_CAN_TRIPOWER_H
-#include "../include.h"
 
 #include "SmaInverterBase.h"
 #include "src/devboard/hal/hal.h"
diff --git a/Software/src/inverter/SOFAR-CAN.cpp b/Software/src/inverter/SOFAR-CAN.cpp
index 44cbe573..cac1bf65 100644
--- a/Software/src/inverter/SOFAR-CAN.cpp
+++ b/Software/src/inverter/SOFAR-CAN.cpp
@@ -1,7 +1,6 @@
 #include "SOFAR-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* This implementation of the SOFAR can protocol is halfway done. What's missing is implementing the inverter replies, all the CAN messages are listed, but the can sending is missing. */
 
diff --git a/Software/src/inverter/SOFAR-CAN.h b/Software/src/inverter/SOFAR-CAN.h
index 3b8fa635..50530063 100644
--- a/Software/src/inverter/SOFAR-CAN.h
+++ b/Software/src/inverter/SOFAR-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SOFAR_CAN_H
 #define SOFAR_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/SOLAX-CAN.cpp b/Software/src/inverter/SOLAX-CAN.cpp
index 3d78f889..386457f5 100644
--- a/Software/src/inverter/SOLAX-CAN.cpp
+++ b/Software/src/inverter/SOLAX-CAN.cpp
@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 #define NUMBER_OF_MODULES 0
 #define BATTERY_TYPE 0x50
diff --git a/Software/src/inverter/SOLAX-CAN.h b/Software/src/inverter/SOLAX-CAN.h
index 4cd8a978..0a3d8efa 100644
--- a/Software/src/inverter/SOLAX-CAN.h
+++ b/Software/src/inverter/SOLAX-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SOLAX_CAN_H
 #define SOLAX_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/SOLXPOW-CAN.cpp b/Software/src/inverter/SOLXPOW-CAN.cpp
index f4bd6436..d6f2cdcc 100644
--- a/Software/src/inverter/SOLXPOW-CAN.cpp
+++ b/Software/src/inverter/SOLXPOW-CAN.cpp
@@ -1,7 +1,6 @@
 #include "SOLXPOW-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 #define SEND_0  //If defined, the messages will have ID ending with 0 (useful for some inverters)
 //#define SEND_1 //If defined, the messages will have ID ending with 1 (useful for some inverters)
diff --git a/Software/src/inverter/SOLXPOW-CAN.h b/Software/src/inverter/SOLXPOW-CAN.h
index 6f818c9b..73bc7e13 100644
--- a/Software/src/inverter/SOLXPOW-CAN.h
+++ b/Software/src/inverter/SOLXPOW-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SOLXPOW_CAN_H
 #define SOLXPOW_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/Software/src/inverter/SUNGROW-CAN.cpp b/Software/src/inverter/SUNGROW-CAN.cpp
index 9c43dc9e..8f05e02d 100644
--- a/Software/src/inverter/SUNGROW-CAN.cpp
+++ b/Software/src/inverter/SUNGROW-CAN.cpp
@@ -1,7 +1,6 @@
 #include "SUNGROW-CAN.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* TODO: 
 This protocol is still under development. It can not be used yet for Sungrow inverters, 
diff --git a/Software/src/inverter/SUNGROW-CAN.h b/Software/src/inverter/SUNGROW-CAN.h
index edeebb90..a28a2372 100644
--- a/Software/src/inverter/SUNGROW-CAN.h
+++ b/Software/src/inverter/SUNGROW-CAN.h
@@ -1,6 +1,5 @@
 #ifndef SUNGROW_CAN_H
 #define SUNGROW_CAN_H
-#include "../include.h"
 
 #include "CanInverterProtocol.h"
 
diff --git a/test/utils/events_test.cpp_ b/test/utils/events_test.cpp_
index 0f2755cf..4a76ccf2 100644
--- a/test/utils/events_test.cpp_
+++ b/test/utils/events_test.cpp_
@@ -1,7 +1,6 @@
 // The test library must be included first!
 #include "../test_lib.h"
 
-#include "../../Software/src/include.h"
 #include "../../Software/src/devboard/utils/timer.cpp"