diff --git a/halext/drivers/gdispNokia6610/gdisp_lld.mk b/halext/drivers/gdispNokia6610/gdisp_lld.mk
index dbcfe27f..43ed7581 100644
--- a/halext/drivers/gdispNokia6610/gdisp_lld.mk
+++ b/halext/drivers/gdispNokia6610/gdisp_lld.mk
@@ -1,5 +1,5 @@
 # List the required driver.
-HALSRC += ${CHIBIOS}/os/halext/drivers/gdispNokia6610/gdisp_lld.c
+HALSRC += $(LCDLIB)/halext/drivers/gdispNokia6610/gdisp_lld.c
 
 # Required include directories
-HALINC += ${CHIBIOS}/os/halext/drivers/gdispNokia6610
+HALINC += $(LCDLIB)/halext/drivers/gdispNokia6610
diff --git a/halext/drivers/gdispS6d1121/gdisp_lld.mk b/halext/drivers/gdispS6d1121/gdisp_lld.mk
index 632655ea..1ad9ab88 100644
--- a/halext/drivers/gdispS6d1121/gdisp_lld.mk
+++ b/halext/drivers/gdispS6d1121/gdisp_lld.mk
@@ -1,5 +1,5 @@
 # List the required driver.
-HALSRC += ${CHIBIOS}/os/halext/drivers/gdispS6d1121/gdisp_lld.c
+HALSRC += $(LCDLIB)/halext/drivers/gdispS6d1121/gdisp_lld.c
 
 # Required include directories
-HALINC += ${CHIBIOS}/os/halext/drivers/gdispS6d1121
+HALINC += $(LCDLIB)/halext/drivers/gdispS6d1121
diff --git a/halext/drivers/gdispSsd1289/gdisp_lld.mk b/halext/drivers/gdispSsd1289/gdisp_lld.mk
index 05d0d319..97d84f4d 100644
--- a/halext/drivers/gdispSsd1289/gdisp_lld.mk
+++ b/halext/drivers/gdispSsd1289/gdisp_lld.mk
@@ -1,5 +1,5 @@
 # List the required driver.
-HALSRC += ${CHIBIOS}/os/halext/drivers/gdispSsd1289/gdisp_lld.c
+HALSRC += $(LCDLIB)/halext/drivers/gdispSsd1289/gdisp_lld.c
 
 # Required include directories
-HALINC += ${CHIBIOS}/os/halext/drivers/gdispSsd1289
+HALINC += $(LCDLIB)/halext/drivers/gdispSsd1289
diff --git a/halext/drivers/gdispTestStub/gdisp_lld.mk b/halext/drivers/gdispTestStub/gdisp_lld.mk
index 50ee07a6..c58725e5 100644
--- a/halext/drivers/gdispTestStub/gdisp_lld.mk
+++ b/halext/drivers/gdispTestStub/gdisp_lld.mk
@@ -1,5 +1,5 @@
 # List the required driver.
-HALSRC += ${CHIBIOS}/os/halext/drivers/gdispTestStub/gdisp_lld.c
+HALSRC += $(LCDLIB)/halext/drivers/gdispTestStub/gdisp_lld.c
 
 # Required include directories
-HALINC += ${CHIBIOS}/os/halext/drivers/gdispTestStub
+HALINC += $(LCDLIB)/halext/drivers/gdispTestStub
diff --git a/halext/halext.mk b/halext/halext.mk
index 8768a07b..5afb24b0 100644
--- a/halext/halext.mk
+++ b/halext/halext.mk
@@ -1,9 +1,9 @@
 # List of all the ChibiOS/RT META files, there is no need to remove the files
 # from this list, you can disable parts of the kernel by editing halconf.h.
 
-HALSRC +=	${CHIBIOS}/os/halext/src/gdisp.c \
-			${CHIBIOS}/os/halext/src/gdisp_fonts.c \
-			${CHIBIOS}/os/halext/src/gdisp_emulation.c
+HALSRC +=	$(LCDLIB)/halext/src/gdisp.c \
+			$(LCDLIB)/halext/src/gdisp_fonts.c \
+			$(LCDLIB)/halext/src/gdisp_emulation.c
 
 # Required include directories
-HALINC +=	${CHIBIOS}/os/halext/include
+HALINC +=	$(LCDLIB)/halext/include