diff --git a/libraries/base/common/hdllib.cfg b/libraries/base/common/hdllib.cfg
index 4b17a1a1aa3be8cd558a5330ef044096ffa7379f..60a0b1bc6cb94ecfc7be87a933f6884f0c6f9d2f 100644
--- a/libraries/base/common/hdllib.cfg
+++ b/libraries/base/common/hdllib.cfg
@@ -6,6 +6,13 @@ build_sim_dir = $HDL_BUILD_DIR
 build_synth_dir = 
 
 synth_files =
+    $UNB/Firmware/modules/common/src/vhdl/common_pkg.vhd
+    $UNB/Firmware/modules/common/src/vhdl/common_str_pkg.vhd
+    $UNB/Firmware/modules/common/src/vhdl/common_mem_pkg.vhd
+    $UNB/Firmware/modules/common/src/vhdl/common_field_pkg.vhd
+    $UNB/Firmware/modules/common/src/vhdl/common_lfsr_sequences_pkg.vhd
+    $UNB/Firmware/modules/common/src/vhdl/common_components_pkg.vhd
+    
     $UNB/Firmware/modules/MegaWizard/fifo_sc/fifo_sc.vhd
     $UNB/Firmware/modules/MegaWizard/fifo_dc/fifo_dc.vhd
     $UNB/Firmware/modules/MegaWizard/fifo_dc/fifo_dc_mixed_widths.vhd
@@ -22,13 +29,6 @@ synth_files =
     
     $UNB/Firmware/modules/common/src/ip/MegaWizard/iobuf_in.vhd
     
-    $UNB/Firmware/modules/common/src/vhdl/common_pkg.vhd
-    $UNB/Firmware/modules/common/src/vhdl/common_str_pkg.vhd
-    $UNB/Firmware/modules/common/src/vhdl/common_mem_pkg.vhd
-    $UNB/Firmware/modules/common/src/vhdl/common_field_pkg.vhd
-    $UNB/Firmware/modules/common/src/vhdl/common_lfsr_sequences_pkg.vhd
-    $UNB/Firmware/modules/common/src/vhdl/common_components_pkg.vhd
-    
     $UNB/Firmware/modules/common/src/vhdl/common_wideband_data_scope.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_iobuf_in.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_iobuf_in_a_stratix4.vhd
@@ -79,7 +79,7 @@ synth_files =
     $UNB/Firmware/modules/common/src/vhdl/common_select_m_symbols.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_reorder_symbol.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_multiplexer.vhd
-    $UNB/Firmware/modules/common/$UNB/Firmware/modules/common/src/vhdl/common_demultiplexer.vhd
+    $UNB/Firmware/modules/common/src/vhdl/common_demultiplexer.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_transpose_symbol.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_transpose.vhd
     $UNB/Firmware/modules/common/src/vhdl/common_complex_round.vhd