From 7e70a0b05d18665ff775377ca0d8f7514d1e3a86 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Tue, 26 Jul 2016 12:16:22 -0700
Subject: [PATCH] Move pins / Arduino includes to MarlinConfig.h

---
 Marlin/Conditionals_post.h | 9 ---------
 Marlin/MarlinConfig.h      | 5 +++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h
index fc0c6d54a6..3ff131de2e 100644
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@@ -25,15 +25,6 @@
  * Defines that depend on configuration but are not editable.
  */
 
-
-  #include "pins.h"
-
-  #ifndef USBCON
-    #define HardwareSerial_h // trick to disable the standard HWserial
-  #endif
-  #include "Arduino.h"
-
-  #include "macros.h"
 #ifndef CONDITIONALS_POST_H
 #define CONDITIONALS_POST_H
 
diff --git a/Marlin/MarlinConfig.h b/Marlin/MarlinConfig.h
index 07287bb551..4277c65432 100644
--- a/Marlin/MarlinConfig.h
+++ b/Marlin/MarlinConfig.h
@@ -28,6 +28,11 @@
 #include "Configuration.h"
 #include "Conditionals_LCD.h"
 #include "Configuration_adv.h"
+#include "pins.h"
+#ifndef USBCON
+  #define HardwareSerial_h // trick to disable the standard HWserial
+#endif
+#include "Arduino.h"
 #include "Conditionals_post.h"
 #include "SanityCheck.h"