13 files changed, 16 insertions, 15 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c
index 31f08bec..25fa2c4e 100644
--- a/src/gdisp/gdisp.c
+++ b/src/gdisp/gdisp.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP
 
diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h
index 5c90a490..e6b56f2a 100644
--- a/src/gdisp/gdisp.h
+++ b/src/gdisp/gdisp.h
@@ -27,7 +27,7 @@
 #ifndef _GDISP_H
 #define _GDISP_H
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 /* This type definition is defined here as it gets used in other gfx sub-systems even
  * if GFX_USE_GDISP is FALSE.
@@ -153,6 +153,7 @@ extern GDisplay	*GDISP;
 	// Pull in the default hardware configuration for a single controller.
 	// If we have multiple controllers the settings must be set in the
 	// users gfxconf.h file.
+	// Use the compiler include path to find it
 	#include "gdisp_lld_config.h"
 
 	// Unless the user has specified a specific pixel format, use
diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h
index a097c702..8c72f9ac 100644
--- a/src/gdisp/gdisp_colors.h
+++ b/src/gdisp/gdisp_colors.h
@@ -19,7 +19,7 @@
 #ifndef _GDISP_COLORS_H
 #define _GDISP_COLORS_H
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP || defined(__DOXYGEN__)
 
diff --git a/src/gdisp/gdisp_driver.h b/src/gdisp/gdisp_driver.h
index ced6756e..1912afd9 100644
--- a/src/gdisp/gdisp_driver.h
+++ b/src/gdisp/gdisp_driver.h
@@ -19,7 +19,7 @@
 #if GFX_USE_GDISP
 
 // Include the GDRIVER infrastructure
-#include "src/gdriver/gdriver.h"
+#include "../gdriver/gdriver.h"
 
 // Are we currently compiling the driver itself?
 #if defined(GDISP_DRIVER_VMT)
diff --git a/src/gdisp/gdisp_fonts.c b/src/gdisp/gdisp_fonts.c
index 81df08ec..f1ef9e5d 100644
--- a/src/gdisp/gdisp_fonts.c
+++ b/src/gdisp/gdisp_fonts.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_TEXT
 
diff --git a/src/gdisp/gdisp_image.c b/src/gdisp/gdisp_image.c
index 0319030f..853d2f75 100644
--- a/src/gdisp/gdisp_image.c
+++ b/src/gdisp/gdisp_image.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE
 
diff --git a/src/gdisp/gdisp_image_bmp.c b/src/gdisp/gdisp_image_bmp.c
index dd45081a..cc3235c0 100644
--- a/src/gdisp/gdisp_image_bmp.c
+++ b/src/gdisp/gdisp_image_bmp.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP
 
diff --git a/src/gdisp/gdisp_image_gif.c b/src/gdisp/gdisp_image_gif.c
index 515d67e8..0c1ba2c1 100644
--- a/src/gdisp/gdisp_image_gif.c
+++ b/src/gdisp/gdisp_image_gif.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF
 
diff --git a/src/gdisp/gdisp_image_jpg.c b/src/gdisp/gdisp_image_jpg.c
index 0f856e2c..9a10f215 100644
--- a/src/gdisp/gdisp_image_jpg.c
+++ b/src/gdisp/gdisp_image_jpg.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG
 
diff --git a/src/gdisp/gdisp_image_native.c b/src/gdisp/gdisp_image_native.c
index 347738bd..9ed0f664 100644
--- a/src/gdisp/gdisp_image_native.c
+++ b/src/gdisp/gdisp_image_native.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE
 
diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c
index b6e70d91..9a3e3cf0 100644
--- a/src/gdisp/gdisp_image_png.c
+++ b/src/gdisp/gdisp_image_png.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG
 
diff --git a/src/gdisp/gdisp_pixmap.c b/src/gdisp/gdisp_pixmap.c
index a725d547..c22ffcf0 100644
--- a/src/gdisp/gdisp_pixmap.c
+++ b/src/gdisp/gdisp_pixmap.c
@@ -5,7 +5,7 @@
  *              http://ugfx.org/license.html
  */
 
-#include "gfx.h"
+#include "../../gfx.h"
 
 #if GFX_USE_GDISP && GDISP_NEED_PIXMAP
 
@@ -39,8 +39,8 @@
 	#error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT"
 #endif
 
-#include "src/gdisp/gdisp_driver.h"
-#include "src/gdriver/gdriver.h"
+#include "gdisp_driver.h"
+#include "../gdriver/gdriver.h"
 
 typedef struct pixmap {
 	#if GDISP_NEED_PIXMAP_IMAGE
diff --git a/src/gdisp/mcufont/mf_config.h b/src/gdisp/mcufont/mf_config.h
index 5c6f4ea9..3b76ee44 100644
--- a/src/gdisp/mcufont/mf_config.h
+++ b/src/gdisp/mcufont/mf_config.h
@@ -14,7 +14,7 @@
  * Configuration settings related to GFX               *
  *******************************************************/
 
-#include "gfx.h"
+#include "../../../gfx.h"
 
 #if !GFX_USE_GDISP || !GDISP_NEED_TEXT
 	#define MF_NO_COMPILE				// Don't compile any font code