From 1512b34612c3ba465232cfc4b87b0caa46c89e0a Mon Sep 17 00:00:00 2001
From: James Churchill <james@rfdesign.com.au>
Date: Mon, 12 Dec 2011 18:06:45 +1000
Subject: [PATCH] Fix issues with inconsistent order of includes across source
 files

Marlin.h always needs pins.h to be included before it, this was only
done in some files and not others. Marlin.h now explicitly includes
everything it needs. Also, include order was different for each source
file, this has been cleaned up.
Should fix issues with certain pin options not working properly or even
compiling, such as the motor enable pins.
---
 Marlin/EEPROMwrite.h      | 3 ++-
 Marlin/Marlin.h           | 4 +++-
 Marlin/Marlin.pde         | 4 ++--
 Marlin/motion_control.cpp | 2 +-
 Marlin/planner.cpp        | 4 ++--
 Marlin/stepper.cpp        | 6 +++---
 Marlin/temperature.h      | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Marlin/EEPROMwrite.h b/Marlin/EEPROMwrite.h
index 3d8a0b2b9eb2..8e36e6f25466 100644
--- a/Marlin/EEPROMwrite.h
+++ b/Marlin/EEPROMwrite.h
@@ -1,10 +1,11 @@
 #ifndef __EEPROMH
 #define __EEPROMH
 
+#include <EEPROM.h>
+
 #include "Marlin.h"
 #include "planner.h"
 #include "temperature.h"
-#include <EEPROM.h>
 
 template <class T> int EEPROM_writeAnything(int &ee, const T& value)
 {
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index acfc3c2fa6ef..3dde2ceefe06 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -4,9 +4,11 @@
 // Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware.
 // Licence: GPL
 #include <WProgram.h>
-#include "fastio.h"
 #include <avr/pgmspace.h>
+
+#include "fastio.h"
 #include "Configuration.h"
+#include "pins.h"
 
 //#define SERIAL_ECHO(x) Serial << "echo: " << x;
 //#define SERIAL_ECHOLN(x) Serial << "echo: "<<x<<endl;
diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 1a2fadc5a042..869d50255b42 100644
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -27,15 +27,15 @@
 
 #include <EEPROM.h>
 
-#include "EEPROMwrite.h"
 #include "fastio.h"
 #include "Configuration.h"
 #include "pins.h"
 #include "Marlin.h"
-#include "ultralcd.h"
 #include "planner.h"
 #include "stepper.h"
 #include "temperature.h"
+#include "EEPROMwrite.h"
+#include "ultralcd.h"
 #include "motion_control.h"
 #include "cardreader.h"
 #include "watchdog.h"
diff --git a/Marlin/motion_control.cpp b/Marlin/motion_control.cpp
index ff3f8c2f2df6..4c8709b4dcc7 100644
--- a/Marlin/motion_control.cpp
+++ b/Marlin/motion_control.cpp
@@ -21,8 +21,8 @@
 
 #include "Configuration.h"
 #include "Marlin.h"
-#include "stepper.h"
 #include "planner.h"
+#include "stepper.h"
 
 // The arc is approximated by generating a huge number of tiny, linear segments. The length of each 
 // segment is configured in settings.mm_per_arc_segment.  
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index 214226e2c700..02bc8d9caac5 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -56,10 +56,10 @@
 //#include <math.h>       
 //#include <stdlib.h>
 
-#include "Marlin.h"
+#include "fastio.h"
 #include "Configuration.h"
 #include "pins.h"
-#include "fastio.h"
+#include "Marlin.h"
 #include "planner.h"
 #include "stepper.h"
 #include "temperature.h"
diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp
index 771bccfd4bf6..e013ca6a7508 100644
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@ -21,12 +21,12 @@
 /* The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
    and Philipp Tiefenbacher. */
 
-#include "stepper.h"
+#include "fastio.h"
 #include "Configuration.h"
+#include "pins.h"
 #include "Marlin.h"
 #include "planner.h"
-#include "pins.h"
-#include "fastio.h"
+#include "stepper.h"
 #include "temperature.h"
 #include "ultralcd.h"
 
diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index 0f0de985f4e3..640cede4d7a2 100644
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -21,8 +21,8 @@
 #ifndef temperature_h
 #define temperature_h 
 
-#include "Marlin.h"
 #include "fastio.h"
+#include "Marlin.h"
 #ifdef PID_ADD_EXTRUSION_RATE
   #include "stepper.h"
 #endif