diff --git a/lib/CPUs/MIPS/ghdl/mips_core.inc b/lib/CPUs/MIPS/ghdl/mips_core.inc
index 1245027..c496623 100644
--- a/lib/CPUs/MIPS/ghdl/mips_core.inc
+++ b/lib/CPUs/MIPS/ghdl/mips_core.inc
@@ -1,10 +1,16 @@
 # -----------------------------------------------------------
 include $(VHDL_HOME)/make/defs.mk
+include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc
+include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc
+
 # -----------------------------------------------------------
 PKG_NAME := MIPS_CORE
 
 # -----------------------------------------------------------
 MOD_PATH := $(LIB_PATH)/CPUs/MIPS/src/core
+$(PKG_NAME)_SRCS += $(FIFO_SYNC_SRCS)
+$(PKG_NAME)_SRCS += $(FIFO_ASYNC_SRCS)
+
 $(PKG_NAME)_SRCS += $(LIB_PATH)/rams/sim/src/dpram_2w2r2c_ra.vhd
 $(PKG_NAME)_SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd
 $(PKG_NAME)_SRCS += $(MOD_PATH)/mips_types.vhd
diff --git a/lib/CPUs/MIPS/ghdl/tb_mips_top.make b/lib/CPUs/MIPS/ghdl/tb_mips_top.make
index 6bc33a3..57908e0 100644
--- a/lib/CPUs/MIPS/ghdl/tb_mips_top.make
+++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.make
@@ -2,14 +2,8 @@
 include $(VHDL_HOME)/make/defs.mk
 # -----------------------------------------------------------
 include mips_core.inc
-include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc
-include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc
 
 # -----------------------------------------------------------
-# FIFOS
-SRCS += $(FIFO_SYNC_SRCS)
-SRCS += $(FIFO_ASYNC_SRCS)
-
 # UART
 SRCS += $(LIB_PATH)/uart/src/uart_types.vhd
 SRCS += $(LIB_PATH)/uart/src/sim/uart.vhd