From b55295ad336220c2e2be86461da947565e9c0c76 Mon Sep 17 00:00:00 2001
From: Christopher Pepper <p3p@p3psoft.co.uk>
Date: Tue, 1 Aug 2017 03:12:30 +0100
Subject: [PATCH] Post merge fix

Add macros.h to allow Enabled macro, also need to reference include files directly
---
 Marlin/src/HAL/HAL_LPC1768/HAL.cpp      | 2 +-
 Marlin/src/HAL/HAL_LPC1768/arduino.cpp  | 1 +
 Marlin/src/HAL/HAL_LPC1768/pinmapping.h | 1 +
 Marlin/src/HAL/HAL_spi_pins.h           | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp b/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
index 4f887ba850..b2eec4446f 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef TARGET_LPC1768
-
+#include "../../../macros.h"
 #include "../HAL.h"
 
 extern "C" {
diff --git a/Marlin/src/HAL/HAL_LPC1768/arduino.cpp b/Marlin/src/HAL/HAL_LPC1768/arduino.cpp
index 9492d1a57f..9d1632ca73 100644
--- a/Marlin/src/HAL/HAL_LPC1768/arduino.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/arduino.cpp
@@ -22,6 +22,7 @@
 
 #ifdef TARGET_LPC1768
 #include <lpc17xx_pinsel.h>
+#include "../../../macros.h"
 #include "HAL.h"
 
 // Interrupts
diff --git a/Marlin/src/HAL/HAL_LPC1768/pinmapping.h b/Marlin/src/HAL/HAL_LPC1768/pinmapping.h
index 73fbaefa93..9df354daae 100644
--- a/Marlin/src/HAL/HAL_LPC1768/pinmapping.h
+++ b/Marlin/src/HAL/HAL_LPC1768/pinmapping.h
@@ -22,6 +22,7 @@
 
 #ifndef __HAL_PINMAPPING_H__
 #define __HAL_PINMAPPING_H__
+#include "../../../macros.h"
 
 struct pin_data { uint8_t port, pin; };
 struct adc_pin_data { uint8_t port, pin, adc; };
diff --git a/Marlin/src/HAL/HAL_spi_pins.h b/Marlin/src/HAL/HAL_spi_pins.h
index 0a4c88436c..03607317b4 100644
--- a/Marlin/src/HAL/HAL_spi_pins.h
+++ b/Marlin/src/HAL/HAL_spi_pins.h
@@ -21,7 +21,7 @@
 #ifndef HAL_SPI_PINS_H_
 #define HAL_SPI_PINS_H_
 
-#include "MarlinConfig.h"
+#include "../../MarlinConfig.h"
 
 #ifdef ARDUINO_ARCH_SAM
   #include "HAL_DUE/spi_pins.h"