pgmspace.h from ArduinoCore-API is already included with #include api/ArduinoAPI.h

Author: giulcioffi

bootloaders/boot.c

@@ -36,7 +36,6 @@
  */
 #define F_CPU_RESET (16E6/6)
 
-#include "api/deprecated-avr-comp/avr/pgmspace.h"
 #include <avr/io.h>
 #include <assert.h>
 #include <stdbool.h>

cores/arduino/Arduino.h

@@ -20,14 +20,10 @@
 #ifndef Arduino_h
 #define Arduino_h
 
-#include "api/deprecated-avr-comp/avr/pgmspace.h"
-#include <avr/io.h>
-#include <avr/interrupt.h>
-  
 #include "api/ArduinoAPI.h"
 
-#undef F
-#define F(str) (const __FlashStringHelper*)(str)
+#include <avr/io.h>
+#include <avr/interrupt.h>
 
 #ifdef __cplusplus
 extern "C"{