diff --git a/lib/uart/ghdl/uart_generic.inc b/lib/uart/ghdl/uart_generic.inc
index 3ba3bc1..1d03c4a 100644
--- a/lib/uart/ghdl/uart_generic.inc
+++ b/lib/uart/ghdl/uart_generic.inc
@@ -4,15 +4,13 @@ include $(VHDL_HOME)/make/defs.mk
 PKG_NAME := UART_GENERIC
 
 # -----------------------------------------------------------
-MOD_PATH := $(LIB_PATH)/uart/src
-
 $(PKG_NAME)_SRCS += $(LIB_PATH)/misc/bbfifo/src/bbfifo.vhd
-$(PKG_NAME)_SRCS += $(MOD_PATH)/uart_types.vhd
-$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/juart/juart_tx.vhd
-$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/juart/juart_rx.vhd
-$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/uart_tx.vhd
-$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/uart_rx.vhd
-$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/uart.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/uart_types.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/generic/juart/juart_tx.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/generic/juart/juart_rx.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/generic/uart_tx.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/generic/uart_rx.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/generic/uart.vhd
 
 # -----------------------------------------------------------
 
diff --git a/lib/uart/ghdl/uart_sim.inc b/lib/uart/ghdl/uart_sim.inc
index 0ca72b2..b17e906 100644
--- a/lib/uart/ghdl/uart_sim.inc
+++ b/lib/uart/ghdl/uart_sim.inc
@@ -4,10 +4,8 @@ include $(VHDL_HOME)/make/defs.mk
 PKG_NAME := UART_SIM
 
 # -----------------------------------------------------------
-MOD_PATH := $(LIB_PATH)/uart/src
-
-$(PKG_NAME)_SRCS += $(MOD_PATH)/uart_types.vhd
-$(PKG_NAME)_SRCS += $(MOD_PATH)/sim/uart.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/uart_types.vhd
+$(PKG_NAME)_SRCS += $(LIB_PATH)/uart/src/sim/uart.vhd
 
 # -----------------------------------------------------------