Make all include paths in ugfx relative.

The only include path now needed is for drivers (in particular GDISP drivers)

58 files changed, 125 insertions, 153 deletions

diff --git a/drivers/gadc/AT91SAM7/driver.mk b/drivers/gadc/AT91SAM7/driver.mk
index 001d44b1..5a64d7c7 100644
--- a/drivers/gadc/AT91SAM7/driver.mk
+++ b/drivers/gadc/AT91SAM7/driver.mk
@@ -1,5 +1,2 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.c
-
-# Required include directories
 GFXINC += $(GFXLIB)/drivers/gadc/AT91SAM7
+GFXSRC += $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld_AT91SAM7.c
diff --git a/drivers/gadc/AT91SAM7/gadc_lld.c b/drivers/gadc/AT91SAM7/gadc_lld_AT91SAM7.c
index fa1870b0..b061db50 100644
--- a/drivers/gadc/AT91SAM7/gadc_lld.c
+++ b/drivers/gadc/AT91SAM7/gadc_lld_AT91SAM7.c
@@ -14,7 +14,7 @@
 
 #if GFX_USE_GADC
 
-#include "src/gadc/gadc_driver.h"
+#include "../../../src/gadc/gadc_driver.h"
 
 static uint32_t		nextfreq;
 
diff --git a/drivers/gaudio/Win32/driver.mk b/drivers/gaudio/Win32/driver.mk
index f959279f..aa3ed3ab 100644
--- a/drivers/gaudio/Win32/driver.mk
+++ b/drivers/gaudio/Win32/driver.mk
@@ -1,6 +1,4 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_lld.c	\
-			$(GFXLIB)/drivers/gaudio/Win32/gaudio_play_lld.c
-
 GFXINC += $(GFXLIB)/drivers/gaudio/Win32
+GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_Win32.c	\
+			$(GFXLIB)/drivers/gaudio/Win32/gaudio_play_Win32.c
 GFXLIBS += winmm
diff --git a/drivers/gaudio/Win32/gaudio_play_lld.c b/drivers/gaudio/Win32/gaudio_play_Win32.c
index 03d9acea..baafd4ce 100644
--- a/drivers/gaudio/Win32/gaudio_play_lld.c
+++ b/drivers/gaudio/Win32/gaudio_play_Win32.c
@@ -13,7 +13,7 @@
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
 
 /* Include the driver defines */
-#include "src/gaudio/gaudio_driver_play.h"
+#include "../../../src/gaudio/gaudio_driver_play.h"
 
 #undef Red
 #undef Green
diff --git a/drivers/gaudio/Win32/gaudio_record_lld.c b/drivers/gaudio/Win32/gaudio_record_Win32.c
index dd1a201a..e3e122d8 100644
--- a/drivers/gaudio/Win32/gaudio_record_lld.c
+++ b/drivers/gaudio/Win32/gaudio_record_Win32.c
@@ -13,7 +13,7 @@
 #if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD
 
 /* Include the driver defines */
-#include "src/gaudio/gaudio_driver_record.h"
+#include "../../../src/gaudio/gaudio_driver_record.h"
 
 #undef Red
 #undef Green
diff --git a/drivers/gaudio/gadc/driver.mk b/drivers/gaudio/gadc/driver.mk
index b5a2768a..f9d2db03 100644
--- a/drivers/gaudio/gadc/driver.mk
+++ b/drivers/gaudio/gadc/driver.mk
@@ -1,8 +1,5 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_lld.c
-
-# Required include directories
 GFXINC += $(GFXLIB)/drivers/gaudio/gadc
+GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_gadc.c
 
 # Make sure the GADC sub-system is turned on
 GFXDEFS += -DGFX_USE_GADC=GAUDIO_NEED_RECORD
diff --git a/drivers/gaudio/gadc/gaudio_record_lld.c b/drivers/gaudio/gadc/gaudio_record_gadc.c
index 6495309a..a35d070b 100644
--- a/drivers/gaudio/gadc/gaudio_record_lld.c
+++ b/drivers/gaudio/gadc/gaudio_record_gadc.c
@@ -16,7 +16,7 @@
 #endif
 
 /* Include the driver defines */
-#include "src/gaudio/gaudio_driver_record.h"
+#include "../../../src/gaudio/gaudio_driver_record.h"
 
 static void gadcCallbackI(void) {
 	GDataBuffer *pd;
diff --git a/drivers/gaudio/pwm/driver.mk b/drivers/gaudio/pwm/driver.mk
index 52f752aa..32f74c28 100644
--- a/drivers/gaudio/pwm/driver.mk
+++ b/drivers/gaudio/pwm/driver.mk
@@ -1,5 +1,2 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_lld.c
-
-# Required include directories
 GFXINC += $(GFXLIB)/drivers/gaudio/pwm
+GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_pwm.c
diff --git a/drivers/gaudio/pwm/gaudio_play_lld.c b/drivers/gaudio/pwm/gaudio_play_pwm.c
index d4d85c33..91d7a835 100644
--- a/drivers/gaudio/pwm/gaudio_play_lld.c
+++ b/drivers/gaudio/pwm/gaudio_play_pwm.c
@@ -10,7 +10,7 @@
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
 
 /* Include the driver defines */
-#include "src/gaudio/gaudio_driver_play.h"
+#include "../../../src/gaudio/gaudio_driver_play.h"
 
 /* Forward definition */
 static void gaudio_play_pwm_timer_callbackI(void);
diff --git a/drivers/gaudio/vs1053/driver.mk b/drivers/gaudio/vs1053/driver.mk
index faf92852..3dfb3b3d 100644
--- a/drivers/gaudio/vs1053/driver.mk
+++ b/drivers/gaudio/vs1053/driver.mk
@@ -1,7 +1,2 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_lld.c
-
-# Required include directories
 GFXINC += $(GFXLIB)/drivers/gaudio/vs1053
-
-#GFXDEFS += -DGFX_USE_GTIMER=GFX_USE_GAUDIO
+GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_vs1053.c
diff --git a/drivers/gaudio/vs1053/gaudio_play_lld.c b/drivers/gaudio/vs1053/gaudio_play_vs1053.c
index 24c5a176..2aab288c 100644
--- a/drivers/gaudio/vs1053/gaudio_play_lld.c
+++ b/drivers/gaudio/vs1053/gaudio_play_vs1053.c
@@ -10,10 +10,10 @@
 #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
 
 /* Include the driver defines */
-#include "src/gaudio/gaudio_driver_play.h"
+#include "../../../src/gaudio/gaudio_driver_play.h"
 
 /* Include the vs1053 registers */
-#include "drivers/gaudio/vs1053/vs1053.h"
+#include "vs1053.h"
 
 /* Include the board interface */
 #include "gaudio_play_board.h"
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
index ec0df514..cd54155c 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
+++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT			GDISPVMT_ED060SC4
-#include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_ED060SC4.h"
 
diff --git a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
index 3456a508..6adead64 100644
--- a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
+++ b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT			GDISPVMT_HX8347D
-#include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_HX8347D.h"
 
@@ -36,7 +36,7 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
-#include "drivers/gdisp/HX8347D/HX8347D.h"
+#include "HX8347D.h"
 
 #define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }
 
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
index d3d1ca0e..e33b028b 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
+++ b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
@@ -20,8 +20,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9320
-#include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_ILI9320.h"
 
diff --git a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
index 5637b0b2..663ed61d 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
+++ b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
@@ -20,8 +20,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9325
-#include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_ILI9325.h"
 
diff --git a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
index 6a9a929b..a4ee660f 100644
--- a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
+++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
@@ -19,8 +19,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9341
-#include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_ILI9341.h"
 
@@ -41,7 +41,7 @@
 	#define GDISP_INITIAL_BACKLIGHT	100
 #endif
 
-#include "drivers/gdisp/ILI9341/ILI9341.h"
+#include "ILI9341.h"
 
 /*===========================================================================*/
 /* Driver local functions.                                                   */
diff --git a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
index f992cdb2..0a207e0e 100644
--- a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
+++ b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
@@ -20,8 +20,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI93xx
-#include "drivers/gdisp/ILI93xx/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_ILI93xx.h"
 
diff --git a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
index dec1cc31..bd637f0e 100644
--- a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
+++ b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
@@ -19,8 +19,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_ILI9481
-#include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_ILI9481.h"
 
diff --git a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
index 067851e6..6a48ad6f 100644
--- a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
+++ b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
@@ -21,7 +21,7 @@
 
 #define GDISP_DRIVER_VMT	GDISPVMT_LGDP4532
 #include "gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_LGDP4532.h"
 
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
index 72841b64..b50a8537 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
@@ -19,8 +19,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_Nokia6610GE12
-#include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_Nokia6610GE12.h"
 
@@ -28,7 +28,7 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#include "drivers/gdisp/Nokia6610GE12/GE12.h"
+#include "GE12.h"
 
 #define GDISP_SCAN_LINES			132
 #define GDISP_SLEEP_SIZE			32		/* Sleep mode window lines - this must be 32 on this controller */
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
index ed885d19..afa310fb 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
@@ -51,8 +51,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_Nokia6610GE8
-#include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_Nokia6610GE8.h"
 
@@ -60,7 +60,7 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#include "drivers/gdisp/Nokia6610GE8/GE8.h"
+#include "GE8.h"
 
 #define GDISP_SCAN_LINES			132
 
diff --git a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
index ddc67be0..8db73bc5 100644
--- a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
+++ b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT		GDISPVMT_PCD8544
-#include "drivers/gdisp/PCD8544/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 #include "board_PCD8544.h"
 
 /*===========================================================================*/
@@ -26,7 +26,7 @@
 
 #define GDISP_FLG_NEEDFLUSH		(GDISP_FLG_DRIVER << 0)
 
-#include "drivers/gdisp/PCD8544/PCD8544.h"
+#include "PCD8544.h"
 
 /*===========================================================================*/
 /* Driver local routines.                                                    */
diff --git a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
index f37bed0d..0716215c 100644
--- a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
+++ b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT		GDISPVMT_PCF8812
-#include "drivers/gdisp/PCF8812/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 #include "board_PCF8812.h"
 
 /*===========================================================================*/
@@ -29,7 +29,7 @@
 
 #define GDISP_FLG_NEEDFLUSH		(GDISP_FLG_DRIVER << 0)
 
-#include "drivers/gdisp/PCF8812/PCF8812.h"
+#include "PCF8812.h"
 
 /*===========================================================================*/
 /* Driver local routines.                                                    */
diff --git a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c
index 94832248..038ffc1d 100644
--- a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c
+++ b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c
@@ -20,8 +20,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_R61505U
-#include "drivers/gdisp/R61505U/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_R61505U.h"
 
diff --git a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
index a962f2f2..4026237a 100644
--- a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
+++ b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 #define GDISP_DRIVER_VMT			GDISPVMT_RA8875
-#include "drivers/gdisp/RA8875/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 /* include the users board interface */
 #include "board_RA8875.h"
diff --git a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
index b259b5ca..4e174c4d 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
@@ -19,8 +19,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_S6D1121
-#include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_S6D1121.h"
 
diff --git a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
index 9a556a7e..163be520 100644
--- a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
+++ b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
@@ -24,8 +24,8 @@
 #undef GDISP_SCREEN_WIDTH
 #endif
 
-#include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_SPFD54124B.h"
 
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
index 82ad57f0..722a71b3 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1289
-#include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_SSD1289.h"
 
diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
index 5a950b0d..65edbaee 100644
--- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
+++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1306
-#include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_SSD1306.h"
 #include <string.h>   // for memset
@@ -42,7 +42,7 @@
 
 #define GDISP_FLG_NEEDFLUSH			(GDISP_FLG_DRIVER<<0)
 
-#include "drivers/gdisp/SSD1306/SSD1306.h"
+#include "SSD1306.h"
 
 /*===========================================================================*/
 /* Driver local functions.                                                   */
diff --git a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c
index f3d4e225..93a5d0a8 100644
--- a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c
+++ b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c
@@ -20,7 +20,7 @@
 
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1331
 #include "gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_SSD1331.h"
 
diff --git a/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c b/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c
index 35f059cb..e7fd6cff 100644
--- a/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c
+++ b/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c
@@ -20,7 +20,7 @@
 
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1351
 #include "gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_SSD1351.h"
 
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
index d68235f9..98436040 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD1963
-#include "drivers/gdisp/SSD1963/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #define CALC_PERIOD(w,b,f,p)				(p+b+w+f)
 #define CALC_FPR(w,h,hb,hf,hp,vb,vf,vp,fps)	((fps * CALC_PERIOD(w,hb,hf,hp) * CALC_PERIOD(h,vb,vf,vp) * 1048576)/100000000)
@@ -69,7 +69,7 @@ typedef struct LCD_Parameters {
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
-#include "drivers/gdisp/SSD1963/ssd1963.h"
+#include "ssd1963.h"
 
 #define dummy_read(g)               { volatile uint16_t dummy; dummy = read_data(g); (void) dummy; }
 #define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }
diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
index 29afaab5..5ae25b1c 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
+++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT			GDISPVMT_SSD2119
-#include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_SSD2119.h"
 
@@ -38,7 +38,7 @@
 	#define GDISP_NO_DMA_FROM_STACK	FALSE
 #endif
 
-#include "drivers/gdisp/SSD2119/ssd2119.h"
+#include "ssd2119.h"
 
 /*===========================================================================*/
 /* Driver local functions.                                                   */
diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
index dc0b1f84..9ab46b57 100644
--- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
+++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT			GDISPVMT_ST7565
-#include "drivers/gdisp/ST7565/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "board_ST7565.h"
 
@@ -34,7 +34,7 @@
 
 #define GDISP_FLG_NEEDFLUSH			(GDISP_FLG_DRIVER<<0)
 
-#include "drivers/gdisp/ST7565/st7565.h"
+#include "st7565.h"
 
 /*===========================================================================*/
 /* Driver config defaults for backward compatibility.               	     */
diff --git a/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c b/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c
index 204097d3..91e914d3 100644
--- a/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c
+++ b/drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c
@@ -23,8 +23,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_STM32F429iDiscovery
-#include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "stm32_ltdc.h"
 
diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
index 0fb8ba5a..949088b5 100644
--- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
+++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
@@ -23,8 +23,8 @@
 #endif
 
 #define GDISP_DRIVER_VMT			GDISPVMT_STM32LTDC
-#include "drivers/gdisp/STM32LTDC/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #include "stm32_ltdc.h"
 
diff --git a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
index 6e0f4371..aa7738ba 100644
--- a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
+++ b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP
 
 #define GDISP_DRIVER_VMT		GDISPVMT_TLS8204
-#include "drivers/gdisp/TLS8204/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 #include "board_TLS8204.h"
 
 /*===========================================================================*/
@@ -26,7 +26,7 @@
 
 #define GDISP_FLG_NEEDFLUSH		(GDISP_FLG_DRIVER << 0)
 
-#include "drivers/gdisp/TLS8204/TLS8204.h"
+#include "TLS8204.h"
 
 /*===========================================================================*/
 /* Driver local routines.                                                    */
diff --git a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c
index 1d21ab6f..a7d39fd8 100644
--- a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c
+++ b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c
@@ -10,8 +10,8 @@
 #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
 #define GDISP_DRIVER_VMT			GDISPVMT_TestStub
-#include "drivers/gdisp/TestStub/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 #ifndef GDISP_SCREEN_HEIGHT
 	#define GDISP_SCREEN_HEIGHT		128
diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
index 79432bcd..e6a505ae 100644
--- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
+++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
@@ -15,8 +15,8 @@ typedef struct fbInfo {
 	} fbInfo;
 
 #define GDISP_DRIVER_VMT			GDISPVMT_framebuffer
-#include "drivers/gdisp/framebuffer/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "gdisp_lld_config.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 #include "board_framebuffer.h"
 
 typedef struct fbPriv {
diff --git a/drivers/ginput/dial/GADC/driver.mk b/drivers/ginput/dial/GADC/driver.mk
index 763549b8..24370422 100644
--- a/drivers/ginput/dial/GADC/driver.mk
+++ b/drivers/ginput/dial/GADC/driver.mk
@@ -1,5 +1,2 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld_dial.c
-
-# Required include directories
 GFXINC += $(GFXLIB)/drivers/ginput/dial/GADC
+GFXSRC += $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c
diff --git a/drivers/ginput/dial/GADC/ginput_lld_dial.c b/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c
index 9ad43748..49e59a24 100644
--- a/drivers/ginput/dial/GADC/ginput_lld_dial.c
+++ b/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c
@@ -9,7 +9,7 @@
 
 #if GFX_USE_GINPUT && GINPUT_NEED_DIAL
 
-#include "src/ginput/ginput_driver_dial.h"
+#include "../../../../src/ginput/ginput_driver_dial.h"
 
 #if GINPUT_DIAL_NUM_PORTS >= 5
 	#error "GINPUT: Dial - GADC driver currently only supports 4 devices"
diff --git a/drivers/ginput/toggle/Pal/driver.mk b/drivers/ginput/toggle/Pal/driver.mk
index b48fe83a..f2d32830 100644
--- a/drivers/ginput/toggle/Pal/driver.mk
+++ b/drivers/ginput/toggle/Pal/driver.mk
@@ -1,5 +1,2 @@
-# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
-
-# Required include directories
 GFXINC += $(GFXLIB)/drivers/ginput/toggle/Pal
+GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c b/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
index 96ef071e..1a16b70f 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
+++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
@@ -1,24 +1,24 @@
-/*

- * This file is subject to the terms of the GFX License. If a copy of

- * the license was not distributed with this file, you can obtain one at:

- *

- *              http://ugfx.org/license.html

- */

-

-#include "gfx.h"

-

-#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/

-

-#include "src/ginput/ginput_driver_toggle.h"

-

-GINPUT_TOGGLE_DECLARE_STRUCTURE();

-

-void ginput_lld_toggle_init(const GToggleConfig *ptc) {

-	palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);

-}

-

-unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {

-	return palReadBus((IOBus *)ptc->id);

-}

-

-#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */

+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#include "gfx.h"
+
+#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
+
+#include "../../../../src/ginput/ginput_driver_toggle.h"
+
+GINPUT_TOGGLE_DECLARE_STRUCTURE();
+
+void ginput_lld_toggle_init(const GToggleConfig *ptc) {
+	palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);
+}
+
+unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {
+	return palReadBus((IOBus *)ptc->id);
+}
+
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */
diff --git a/drivers/ginput/touch/ADS7843/driver.mk b/drivers/ginput/touch/ADS7843/driver.mk
index 1a0eaf8e..7d2e4681 100644
--- a/drivers/ginput/touch/ADS7843/driver.mk
+++ b/drivers/ginput/touch/ADS7843/driver.mk
@@ -1,2 +1 @@
-# List the required driver.
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
index e9492f55..d5412ad2 100644
--- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
+++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
@@ -10,7 +10,7 @@
 #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) 

 

 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_ADS7843

-#include "src/ginput/ginput_driver_mouse.h"

+#include "../../../../src/ginput/ginput_driver_mouse.h"

 

 // Get the hardware interface

 #include "gmouse_lld_ADS7843_board.h"

diff --git a/drivers/ginput/touch/FT5x06/driver.mk b/drivers/ginput/touch/FT5x06/driver.mk
index 741464e8..fc227e8b 100644
--- a/drivers/ginput/touch/FT5x06/driver.mk
+++ b/drivers/ginput/touch/FT5x06/driver.mk
@@ -1,2 +1 @@
-# List the required driver.
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
index da7c46ed..dbd5981c 100644
--- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
+++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
@@ -10,13 +10,13 @@
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
 
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_FT5x06
-#include "src/ginput/ginput_driver_mouse.h"
+#include "../../../../src/ginput/ginput_driver_mouse.h"
 
 // Get the hardware interface
 #include "gmouse_lld_FT5x06_board.h"
 
 // Hardware definitions
-#include "drivers/ginput/touch/FT5x06/ft5x06.h"
+#include "ft5x06.h"
 
 static bool_t MouseInit(GMouse* m, unsigned driverinstance) {
 	if (!init_board(m, driverinstance))
diff --git a/drivers/ginput/touch/MAX11802/driver.mk b/drivers/ginput/touch/MAX11802/driver.mk
index 246e48b3..0df8cf06 100644
--- a/drivers/ginput/touch/MAX11802/driver.mk
+++ b/drivers/ginput/touch/MAX11802/driver.mk
@@ -1,2 +1 @@
-# List the required driver.
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
index 713b9aad..8976cceb 100644
--- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
+++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
@@ -10,10 +10,10 @@
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
 
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_MAX11802
-#include "src/ginput/ginput_driver_mouse.h"
+#include "../../../../src/ginput/ginput_driver_mouse.h"
 
 // Hardware definitions
-#include "drivers/ginput/touch/MAX11802/max11802.h"
+#include "max11802.h"
 
 // Get the hardware interface
 #include "gmouse_lld_MAX11802_board.h"
diff --git a/drivers/ginput/touch/MCU/driver.mk b/drivers/ginput/touch/MCU/driver.mk
index c8c792b2..dfd96b6f 100644
--- a/drivers/ginput/touch/MCU/driver.mk
+++ b/drivers/ginput/touch/MCU/driver.mk
@@ -1,2 +1 @@
-# List the required driver.
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
diff --git a/drivers/ginput/touch/MCU/gmouse_lld_MCU.c b/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
index a69ae72e..8204e28c 100644
--- a/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
+++ b/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
@@ -10,7 +10,7 @@
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
 
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_MCU
-#include "src/ginput/ginput_driver_mouse.h"
+#include "../../../../src/ginput/ginput_driver_mouse.h"
 
 // Get the hardware interface
 #include "gmouse_lld_MCU_board.h"
diff --git a/drivers/ginput/touch/STMPE610/driver.mk b/drivers/ginput/touch/STMPE610/driver.mk
index 364a01ff..d8fa97d6 100644
--- a/drivers/ginput/touch/STMPE610/driver.mk
+++ b/drivers/ginput/touch/STMPE610/driver.mk
@@ -1,2 +1 @@
-# List the required driver.
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
index acfa202e..2eb8f429 100644
--- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
+++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
@@ -10,10 +10,10 @@
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
 
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_STMPE610
-#include "src/ginput/ginput_driver_mouse.h"
+#include "../../../../src/ginput/ginput_driver_mouse.h"
 
 // Hardware definitions
-#include "drivers/ginput/touch/STMPE610/stmpe610.h"
+#include "stmpe610.h"
 
 // Get the hardware interface
 #include "gmouse_lld_STMPE610_board.h"
diff --git a/drivers/ginput/touch/STMPE811/driver.mk b/drivers/ginput/touch/STMPE811/driver.mk
index cf12507b..12ce9243 100644
--- a/drivers/ginput/touch/STMPE811/driver.mk
+++ b/drivers/ginput/touch/STMPE811/driver.mk
@@ -1,2 +1 @@
-# List the required driver.
 GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
index 444888af..8cb1b70e 100644
--- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
+++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
@@ -10,10 +10,10 @@
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
 
 #define GMOUSE_DRIVER_VMT		GMOUSEVMT_STMPE811
-#include "src/ginput/ginput_driver_mouse.h"
+#include "../../../../src/ginput/ginput_driver_mouse.h"
 
 // Hardware definitions
-#include "drivers/ginput/touch/STMPE811/stmpe811.h"
+#include "stmpe811.h"
 
 // Get the hardware interface
 #include "gmouse_lld_STMPE811_board.h"
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index f731d3b5..557e4ad0 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -14,7 +14,7 @@
 
 #define GDISP_DRIVER_VMT			GDISPVMT_Win32
 #include "gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 // Configuration parameters for this driver
 #ifndef GDISP_SCREEN_WIDTH
@@ -82,7 +82,7 @@
 
 #if GINPUT_NEED_TOGGLE
 	/* Include toggle support code */
-	#include "src/ginput/ginput_driver_toggle.h"
+	#include "../../../src/ginput/ginput_driver_toggle.h"
 
 	// Hack until toggle use gdriver.
 	static GDisplay *toggleWindow;
@@ -91,7 +91,7 @@
 #if GINPUT_NEED_MOUSE
 	// Include mouse support code
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_Win32
-	#include "src/ginput/ginput_driver_mouse.h"
+	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
 	static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance);
@@ -132,14 +132,14 @@
 
 #if GINPUT_NEED_KEYBOARD
 	#define GKEYBOARD_DRIVER_VMT		GKEYBOARDVMT_Win32
-	#include "src/ginput/ginput_driver_keyboard.h"
+	#include "../../../src/ginput/ginput_driver_keyboard.h"
 
 	#if !GKEYBOARD_WIN32_NO_LAYOUT
 		#if GKEYBOARD_LAYOUT_OFF
 			#error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE."
 		#endif
 
-		#include "src/ginput/ginput_keyboard_microcode.h"
+		#include "../../../src/ginput/ginput_keyboard_microcode.h"
 
 		// Forward definitions
 		extern uint8_t	GKEYBOARD_WIN32_DEFAULT_LAYOUT[];
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c
index 02091c8e..0b10c7c5 100644
--- a/drivers/multiple/X/gdisp_lld_X.c
+++ b/drivers/multiple/X/gdisp_lld_X.c
@@ -20,7 +20,7 @@
 
 #define GDISP_DRIVER_VMT				GDISPVMT_X11
 #include "gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 
 // Configuration parameters for this driver
 #ifndef GDISP_FORCE_24BIT
@@ -56,7 +56,7 @@
 #if GINPUT_NEED_MOUSE
 	// Include mouse support code
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_X11
-	#include "src/ginput/ginput_driver_mouse.h"
+	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
 	static bool_t XMouseInit(GMouse *m, unsigned driverinstance);
@@ -98,7 +98,7 @@
 #if GINPUT_NEED_KEYBOARD
 	// Include mouse support code
 	#define GKEYBOARD_DRIVER_VMT		GKEYBOARDVMT_X
-	#include "src/ginput/ginput_driver_keyboard.h"
+	#include "../../../src/ginput/ginput_driver_keyboard.h"
 
 	#if !GKEYBOARD_X_NO_LAYOUT
 		#if GKEYBOARD_LAYOUT_OFF
@@ -108,7 +108,7 @@
 		// Forward definitions
 		extern uint8_t	GKEYBOARD_X_DEFAULT_LAYOUT[];
 
-		#include "src/ginput/ginput_keyboard_microcode.h"
+		#include "../../../src/ginput/ginput_keyboard_microcode.h"
 		#include <X11/keysym.h>
 
 		// This is the layout code for the English US keyboard.
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
index d6279127..88a59c8e 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
+++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
@@ -14,7 +14,7 @@
 
 #define GDISP_DRIVER_VMT			GDISPVMT_uGFXnet
 #include "gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
+#include "../../../src/gdisp/gdisp_driver.h"
 #include "uGFXnetProtocol.h"
 
 #ifndef GDISP_SCREEN_WIDTH
@@ -39,7 +39,7 @@
 #if GINPUT_NEED_MOUSE
 	// Include mouse support code
 	#define GMOUSE_DRIVER_VMT		GMOUSEVMT_uGFXnet
-	#include "src/ginput/ginput_driver_mouse.h"
+	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
 	static bool_t NMouseInit(GMouse *m, unsigned driverinstance);