diff --git a/lib/emac/ghdl/tb_emac_top_jb.make b/lib/emac/ghdl/tb_emac_top_jb.make
index e7d4b2e..257ee17 100644
--- a/lib/emac/ghdl/tb_emac_top_jb.make
+++ b/lib/emac/ghdl/tb_emac_top_jb.make
@@ -1,22 +1,13 @@
-include ../../../lib/FIFO/ghdl/fifo_sync.inc
-include ../../../lib/FIFO/ghdl/fifo_async.inc
+include emac_rx.inc
+include emac_tx.inc
 
 ROOT_PATH := ../../..
 LIB_PATH := $(ROOT_PATH)/lib
 
-SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
-SRCS += $(LIB_PATH)/rams/dpram_1w1r2c_ra_sim.vhd
-SRCS += $(LIB_PATH)/rams/dpram_2w2r2c_ra_sim.vhd
-SRCS += $(LIB_PATH)/rams/dpram_1w1r2c_ro_sim.vhd
-SRCS += $(LIB_PATH)/rams/dpram_2w2r2c_ro_sim.vhd
 SRCS += $(FIFO_SYNC_SRCS)
 SRCS += $(FIFO_ASYNC_SRCS)
-SRCS += $(LIB_PATH)/emac/src/piso.vhd
-SRCS += $(LIB_PATH)/emac/src/sipo.vhd
-SRCS += $(LIB_PATH)/emac/src/crc32.vhd
-SRCS += $(LIB_PATH)/emac/src/emac_types.vhd
-SRCS += $(LIB_PATH)/emac/src/emac_rx.vhd
-SRCS += $(LIB_PATH)/emac/src/emac_tx.vhd
+SRCS += $(EMAC_RX_SRCS)
+SRCS += $(EMAC_TX_SRCS)
 SRCS += $(LIB_PATH)/emac/src/emac_top_jb.vhd
 SRCS += $(LIB_PATH)/emac/src/pkt_gen.vhd
 SRCS += $(LIB_PATH)/emac/src/tb_emac_top_jb.vhd