diff --git a/src/DEPENDENCIES b/src/DEPENDENCIES
index 8cafde3f41..c241153e76 100644
--- a/src/DEPENDENCIES
+++ b/src/DEPENDENCIES
@@ -22,7 +22,6 @@ cmfd_data.o: tally_header.o
 
 cmfd_execute.o: cmfd_data.o
 cmfd_execute.o: cmfd_message_passing.o
-cmfd_execute.o: cmfd_output.o
 cmfd_execute.o: cmfd_power_solver.o
 cmfd_execute.o: cmfd_snes_solver.o
 cmfd_execute.o: constants.o
@@ -62,7 +61,6 @@ cmfd_output.o: cmfd_data.o
 cmfd_output.o: cmfd_header.o
 cmfd_output.o: constants.o
 cmfd_output.o: global.o
-cmfd_output.o: string.o
 
 cmfd_power_solver.o: cmfd_loss_operator.o
 cmfd_power_solver.o: cmfd_prod_operator.o
@@ -86,6 +84,17 @@ cmfd_snes_solver.o: constants.o
 cmfd_snes_solver.o: global.o
 cmfd_snes_solver.o: string.o
 
+cross_section.o: ace_header.o
+cross_section.o: constants.o
+cross_section.o: error.o
+cross_section.o: fission.o
+cross_section.o: global.o
+cross_section.o: material_header.o
+cross_section.o: random_lcg.o
+cross_section.o: search.o
+
+doppler.o: constants.o
+
 eigenvalue.o: cmfd_execute.o
 eigenvalue.o: constants.o
 eigenvalue.o: error.o
@@ -103,17 +112,6 @@ eigenvalue.o: state_point.o
 eigenvalue.o: string.o
 eigenvalue.o: tally.o
 
-cross_section.o: ace_header.o
-cross_section.o: constants.o
-cross_section.o: error.o
-cross_section.o: fission.o
-cross_section.o: global.o
-cross_section.o: material_header.o
-cross_section.o: random_lcg.o
-cross_section.o: search.o
-
-doppler.o: constants.o
-
 endf.o: constants.o
 endf.o: string.o
 
@@ -221,9 +219,9 @@ input_xml.o: tally_initialize.o
 input_xml.o: templates/cross_sections_t.o
 input_xml.o: templates/geometry_t.o
 input_xml.o: templates/materials_t.o
+input_xml.o: templates/plots_t.o
 input_xml.o: templates/settings_t.o
 input_xml.o: templates/tallies_t.o
-input_xml.o: templates/plots_t.o
 
 interpolation.o: constants.o
 interpolation.o: endf_header.o
@@ -271,8 +269,8 @@ particle_restart.o: constants.o
 particle_restart.o: geometry_header.o
 particle_restart.o: global.o
 particle_restart.o: hdf5_interface.o
-particle_restart.o: particle_header.o
 particle_restart.o: output.o
+particle_restart.o: particle_header.o
 particle_restart.o: physics.o
 particle_restart.o: random_lcg.o
 particle_restart.o: source.o
@@ -321,6 +319,7 @@ random_lcg.o: global.o
 search.o: error.o
 search.o: global.o
 
+set_header.o: constants.o
 set_header.o: list_header.o
 
 source.o: bank_header.o
diff --git a/src/utils/build_dependencies.py b/src/utils/build_dependencies.py
index d193d3ef95..a1e376886a 100755
--- a/src/utils/build_dependencies.py
+++ b/src/utils/build_dependencies.py
@@ -13,7 +13,9 @@ for src in glob.iglob('*.F90'):
             name = words[1].strip(',')
             if name in ['mpi','hdf5','h5lt']:
                 continue
-            d.add(words[1].strip(','))
+            if name.startswith('xml_data_'):
+                name = name.replace('xml_data_', 'templates/')
+            d.add(name)
     if d:
         d = list(d)
         d.sort()