diff --git a/hal/stm32f407_btt/app_hal.c b/hal/stm32f407_btt/app_hal.c
index 639a3b04..986fb620 100644
--- a/hal/stm32f407_btt/app_hal.c
+++ b/hal/stm32f407_btt/app_hal.c
@@ -1,5 +1,5 @@
 
-#include "Arduino.h"
+#include <Arduino.h>
 
 #include "stm32f4xx.h"
 //#include "stm32f429i_discovery.h"
diff --git a/include/hasp_conf.h b/include/hasp_conf.h
index 138d57ce..2a58d3c0 100644
--- a/include/hasp_conf.h
+++ b/include/hasp_conf.h
@@ -169,7 +169,7 @@
 #include "Windows.h"
 #elif defined(POSIX)
 #else
-#include "Arduino.h"
+#include <Arduino.h>
 #endif
 
 #if HASP_USE_SPIFFS > 0
diff --git a/lib/ArduinoLog/ArduinoLog.h b/lib/ArduinoLog/ArduinoLog.h
index 65f945c9..1db9dc2d 100644
--- a/lib/ArduinoLog/ArduinoLog.h
+++ b/lib/ArduinoLog/ArduinoLog.h
@@ -17,7 +17,7 @@ Licensed under the MIT License <http://opensource.org/licenses/MIT>.
 #include <inttypes.h>
 #include <stdarg.h>
 #if defined(ARDUINO) && ARDUINO >= 100
-#include "Arduino.h"
+#include <Arduino.h>
 #else
 #include "WProgram.h"
 #endif
diff --git a/lib/TouchScreen/TouchScreen.cpp b/lib/TouchScreen/TouchScreen.cpp
index 77bce274..3eee471b 100644
--- a/lib/TouchScreen/TouchScreen.cpp
+++ b/lib/TouchScreen/TouchScreen.cpp
@@ -4,7 +4,7 @@
 // Code under MIT License
 // Code under MIT License
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include "pins_arduino.h"
 
 #ifdef __AVR
diff --git a/lib/XPT2046_Touchscreen_ID542/XPT2046_Touchscreen.h b/lib/XPT2046_Touchscreen_ID542/XPT2046_Touchscreen.h
index baeb70bd..445aa81b 100644
--- a/lib/XPT2046_Touchscreen_ID542/XPT2046_Touchscreen.h
+++ b/lib/XPT2046_Touchscreen_ID542/XPT2046_Touchscreen.h
@@ -23,7 +23,7 @@
 #ifndef _XPT2046_Touchscreen_h_
 #define _XPT2046_Touchscreen_h_
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include <SPI.h>
 
 #if ARDUINO < 10600
diff --git a/lib/lv_lib_qrcode/qrcodegen.cpp b/lib/lv_lib_qrcode/qrcodegen.cpp
index 45a62e1a..bd8ed669 100644
--- a/lib/lv_lib_qrcode/qrcodegen.cpp
+++ b/lib/lv_lib_qrcode/qrcodegen.cpp
@@ -23,7 +23,7 @@
  *   out of or in connection with the Software or the use or other dealings in the
  *   Software.
  */
-#include "Arduino.h" // for PROGMEM
+#include <Arduino.h> // for PROGMEM
 
 #include <assert.h>
 #include <limits.h>
diff --git a/src/dev/esp32/esp32.cpp b/src/dev/esp32/esp32.cpp
index 67775ac7..00b8400c 100644
--- a/src/dev/esp32/esp32.cpp
+++ b/src/dev/esp32/esp32.cpp
@@ -3,7 +3,7 @@
 
 #if defined(ESP32)
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include <Esp.h>
 #include <WiFi.h>
 #include "esp_system.h"
diff --git a/src/dev/esp32/lanbonl8.cpp b/src/dev/esp32/lanbonl8.cpp
index 7ea4d7d6..944e6c1e 100644
--- a/src/dev/esp32/lanbonl8.cpp
+++ b/src/dev/esp32/lanbonl8.cpp
@@ -5,7 +5,7 @@
 
 #if defined(LANBONL8)
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include "dev/esp32/esp32.h"
 
 #include "driver/pcnt.h" // Pulse count driver
diff --git a/src/dev/esp8266/esp8266.cpp b/src/dev/esp8266/esp8266.cpp
index cd2a87e9..f77294a5 100644
--- a/src/dev/esp8266/esp8266.cpp
+++ b/src/dev/esp8266/esp8266.cpp
@@ -3,7 +3,7 @@
 
 #if defined(ESP8266)
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include <Esp.h>
 #include <ESP8266WiFi.h>
 
diff --git a/src/dev/stm32f4/stm32f4.cpp b/src/dev/stm32f4/stm32f4.cpp
index 8a1a84ac..96ff16eb 100644
--- a/src/dev/stm32f4/stm32f4.cpp
+++ b/src/dev/stm32f4/stm32f4.cpp
@@ -3,7 +3,7 @@
 
 #if defined(STM32F4xx)
 
-#include "Arduino.h"
+#include <Arduino.h>
 
 #include "stm32f4.h"
 
diff --git a/src/dev/stm32f7/stm32f7.cpp b/src/dev/stm32f7/stm32f7.cpp
index 028dc6a1..3a854aa9 100644
--- a/src/dev/stm32f7/stm32f7.cpp
+++ b/src/dev/stm32f7/stm32f7.cpp
@@ -3,7 +3,7 @@
 
 #if defined(STM32F7xx)
 
-#include "Arduino.h"
+#include <Arduino.h>
 
 #include "stm32f7.h"
 
diff --git a/src/hasp/hasp.h b/src/hasp/hasp.h
index cc02cc35..554755f1 100644
--- a/src/hasp/hasp.h
+++ b/src/hasp/hasp.h
@@ -5,7 +5,7 @@
 #define HASP_H
 
 #ifdef ARDUINO
-#include "Arduino.h"
+#include <Arduino.h>
 #endif
 
 #include "hasplib.h"
diff --git a/src/hasp/hasp_page.cpp b/src/hasp/hasp_page.cpp
index 784380d9..c42a6350 100644
--- a/src/hasp/hasp_page.cpp
+++ b/src/hasp/hasp_page.cpp
@@ -2,6 +2,8 @@
    For full license information read the LICENSE file in the project folder */
 
 #include "hasplib.h"
+#include "hasp_filesystem.h"
+
 #include <fstream>
 
 #if defined(ARDUINO)
diff --git a/src/hasp/hasp_parser.cpp b/src/hasp/hasp_parser.cpp
index fc14e005..323ccf45 100644
--- a/src/hasp/hasp_parser.cpp
+++ b/src/hasp/hasp_parser.cpp
@@ -3,7 +3,7 @@
 
 #ifdef ARDUINO
 #include "pgmspace.h"
-#include "Arduino.h"
+#include <Arduino.h>
 #endif
 
 #include "hasplib.h"
diff --git a/src/hasp_eeprom.cpp b/src/hasp_eeprom.cpp
index fdb02824..7f931d84 100644
--- a/src/hasp_eeprom.cpp
+++ b/src/hasp_eeprom.cpp
@@ -6,7 +6,7 @@
 #if HASP_USE_EEPROM > 0
 
 #ifdef ARDUINO
-#include "Arduino.h"
+#include <Arduino.h>
 #endif
 
 #include "EEPROM.h"
diff --git a/src/sys/net/hasp_wifi.cpp b/src/sys/net/hasp_wifi.cpp
index 72cee178..0276d99c 100644
--- a/src/sys/net/hasp_wifi.cpp
+++ b/src/sys/net/hasp_wifi.cpp
@@ -21,6 +21,7 @@
 #ifndef ESP_ARDUINO_VERSION_VAL
 #define ESP_ARDUINO_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch))
 #endif
+
 #include <WiFi.h>
 #elif defined(ARDUINO_ARCH_ESP8266)
 #include <ESP8266WiFi.h>