diff --git a/common/firmware/hdl/LinkCombinerCore.vhd b/common/firmware/hdl/LinkCombinerCore.vhd
index 54a09f1ec60364be15b0bcdc15783de00d89c54c..c1c845c88158fb63e070c4f4df59dfa836bd42db 100644
--- a/common/firmware/hdl/LinkCombinerCore.vhd
+++ b/common/firmware/hdl/LinkCombinerCore.vhd
@@ -2,10 +2,7 @@ library IEEE;
 use IEEE.STD_LOGIC_1164.ALL;
 use IEEE.NUMERIC_STD.ALL;
 use work.emp_data_types.all;
-use work.front_end_data_types.all;
-use work.gbt_module_constants.all;
 use work.dtc_link_maps.all;
-use work.dtc_data_types.all;
 use work.dtc_constants.all;
 
 
diff --git a/common/firmware/hdl/LinkCombinerIPBus.vhd b/common/firmware/hdl/LinkCombinerIPBus.vhd
index 18a08325379e68a329f95f0f85b175af2318052c..e3d76a660a697a2e68267f7fd3f61f1bacbb4ba4 100644
--- a/common/firmware/hdl/LinkCombinerIPBus.vhd
+++ b/common/firmware/hdl/LinkCombinerIPBus.vhd
@@ -6,10 +6,7 @@ use work.emp_data_types.all;
 use work.ipbus.all;
 use work.ipbus_reg_types.all;
 
-use work.front_end_data_types.all;
-use work.gbt_module_constants.all;
 use work.dtc_link_maps.all;
-use work.dtc_data_types.all;
 use work.dtc_constants.all;
 
 
diff --git a/common/firmware/hdl/MProcessor.vhd b/common/firmware/hdl/MProcessor.vhd
index 27f7176539dd8bfff702ee0dea536fafdc2f0dd0..5f507a9311fc722a6b3f3fef2a0c2a91cbefc665 100644
--- a/common/firmware/hdl/MProcessor.vhd
+++ b/common/firmware/hdl/MProcessor.vhd
@@ -9,10 +9,7 @@ use work.ipbus_reg_types.all;
 use work.ipbus_decode_mprocessor.all;
 
 use work.dtc_link_maps.all;
-use work.front_end_data_types.all;
-use work.gbt_module_constants.all;
 use work.mprocessor_constants.all;
-use work.dtc_data_types.all;
 use work.dtc_constants.all;
 
 
diff --git a/top/firmware/hdl/emp_payload.vhd b/top/firmware/hdl/emp_payload.vhd
index 41590672bffe494998af95dce7f082e1cacdf3c6..17325913b6bdc3deb2bdc2156a10cca8fe8de7ae 100644
--- a/top/firmware/hdl/emp_payload.vhd
+++ b/top/firmware/hdl/emp_payload.vhd
@@ -14,7 +14,6 @@ use work.emp_slink_types.all;
 ---
 use work.dtc_link_maps.all;
 use work.front_end_data_types.all;
-use work.gbt_module_constants.all;
 use work.mprocessor_constants.all;
 use work.dtc_constants.all;
 use work.dtc_data_types.all;