From ada40af5d6663d4efda9f244544e6cdb5ee7e62c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 16 Feb 2018 18:40:39 -0600
Subject: [PATCH] Move <avr/pgmspace.h> include to MarlinConfig.h

For parity with 2.0.x, which includes pgmspace.h in the HAL.
---
 Marlin/Marlin.h                                              | 1 -
 Marlin/MarlinConfig.h                                        | 2 ++
 Marlin/example_configurations/BQ/Hephestos_2/_Bootscreen.h   | 1 -
 Marlin/example_configurations/Cartesio/_Bootscreen.h         | 1 -
 Marlin/example_configurations/Creality/Ender/_Bootscreen.h   | 1 -
 Marlin/example_configurations/Malyan/M150/_Bootscreen.h      | 1 -
 Marlin/example_configurations/gCreate/gMax1.5+/_Bootscreen.h | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 9af546e686..0aea846503 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -29,7 +29,6 @@
 #include <inttypes.h>
 
 #include <util/delay.h>
-#include <avr/pgmspace.h>
 #include <avr/eeprom.h>
 #include <avr/interrupt.h>
 
diff --git a/Marlin/MarlinConfig.h b/Marlin/MarlinConfig.h
index 64e0bac51f..245974eb74 100644
--- a/Marlin/MarlinConfig.h
+++ b/Marlin/MarlinConfig.h
@@ -38,4 +38,6 @@
 #include "Conditionals_post.h"
 #include "SanityCheck.h"
 
+#include <avr/pgmspace.h>
+
 #endif // MARLIN_CONFIG_H
diff --git a/Marlin/example_configurations/BQ/Hephestos_2/_Bootscreen.h b/Marlin/example_configurations/BQ/Hephestos_2/_Bootscreen.h
index 23ebd84137..3ba0129ea9 100644
--- a/Marlin/example_configurations/BQ/Hephestos_2/_Bootscreen.h
+++ b/Marlin/example_configurations/BQ/Hephestos_2/_Bootscreen.h
@@ -29,7 +29,6 @@
  * Use the Marlin Bitmap Converter to make your own:
  * http://marlinfw.org/tools/u8glib/converter.html
  */
-#include <avr/pgmspace.h>
 
 #define CUSTOM_BOOTSCREEN_BMPWIDTH  62
 
diff --git a/Marlin/example_configurations/Cartesio/_Bootscreen.h b/Marlin/example_configurations/Cartesio/_Bootscreen.h
index 116980c82b..e0efd83767 100644
--- a/Marlin/example_configurations/Cartesio/_Bootscreen.h
+++ b/Marlin/example_configurations/Cartesio/_Bootscreen.h
@@ -29,7 +29,6 @@
  * Use the Marlin Bitmap Converter to make your own:
  * http://marlinfw.org/tools/u8glib/converter.html
  */
-#include <avr/pgmspace.h>
 
 #define CUSTOM_BOOTSCREEN_BMPWIDTH  64
 
diff --git a/Marlin/example_configurations/Creality/Ender/_Bootscreen.h b/Marlin/example_configurations/Creality/Ender/_Bootscreen.h
index 0a1866e6a6..ed877a0379 100644
--- a/Marlin/example_configurations/Creality/Ender/_Bootscreen.h
+++ b/Marlin/example_configurations/Creality/Ender/_Bootscreen.h
@@ -29,7 +29,6 @@
  * Use the Marlin Bitmap Converter to make your own:
  * http://marlinfw.org/tools/u8glib/converter.html
  */
-#include <avr/pgmspace.h>
 
 #define CUSTOM_BOOTSCREEN_TIMEOUT 1000
 #define CUSTOM_BOOTSCREEN_BMPWIDTH 128
diff --git a/Marlin/example_configurations/Malyan/M150/_Bootscreen.h b/Marlin/example_configurations/Malyan/M150/_Bootscreen.h
index 01b6693f12..678a7a106f 100644
--- a/Marlin/example_configurations/Malyan/M150/_Bootscreen.h
+++ b/Marlin/example_configurations/Malyan/M150/_Bootscreen.h
@@ -29,7 +29,6 @@
  * Use the Marlin Bitmap Converter to make your own:
  * http://marlinfw.org/tools/u8glib/converter.html
  */
-#include <avr/pgmspace.h>
 
 #define CUSTOM_BOOTSCREEN_TIMEOUT   1000
 #define CUSTOM_BOOTSCREEN_BMPWIDTH  128
diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/_Bootscreen.h b/Marlin/example_configurations/gCreate/gMax1.5+/_Bootscreen.h
index f08d259793..9fa6b953af 100644
--- a/Marlin/example_configurations/gCreate/gMax1.5+/_Bootscreen.h
+++ b/Marlin/example_configurations/gCreate/gMax1.5+/_Bootscreen.h
@@ -29,7 +29,6 @@
  * Use the Marlin Bitmap Converter to make your own:
  * http://marlinfw.org/tools/u8glib/converter.html
  */
-#include <avr/pgmspace.h>
 
 #define CUSTOM_BOOTSCREEN_BMPWIDTH  112