diff --git a/Makefile b/Makefile
index fd8c8744..1e2a3a8b 100644
--- a/Makefile
+++ b/Makefile
@@ -177,19 +177,9 @@ $(UTILS_DIRS): icg_sim_serv
 # 1.1.1.3 Compile the objects in the specified er7_utils directories.
 .PHONY: $(ER7_UTILS_DIRS)
 $(ER7_UTILS_DIRS): TRICK_CXXFLAGS += -Wno-unused-parameter
-$(ER7_UTILS_DIRS): make_er7_makefiles icg_sim_serv
+$(ER7_UTILS_DIRS): icg_sim_serv
 	@ $(MAKE) -C $@ trick
 
-.PHONY: make_er7_makefiles
-make_er7_makefiles:
-	@for i in $(ER7_UTILS_DIRS) ; do \
-	   $(CP) ${TRICK_HOME}/trick_source/sim_services/Executive/Makefile $$i; \
-	done
-
-ifeq ($(USE_ER7_UTILS), 1)
-icg_sim_serv: | make_er7_makefiles
-endif
-
 # 1.1.1.4 Generate interface code (using ICG) for the specified sim_services
 # header files.
 .PHONY: icg_sim_serv
@@ -285,10 +275,9 @@ clean_sim_serv:
 	done
 	@ $(MAKE) -C ${TRICK_HOME}/trick_source/sim_services/mains real_clean
 
-clean_er7_utils: make_er7_makefiles
+clean_er7_utils: 
 	@for i in $(ER7_UTILS_DIRS) ; do \
 	   $(MAKE) -C $$i real_clean ; \
-	   rm $$i/Makefile; \
 	done
 
 clean_utils:
@@ -301,10 +290,6 @@ clean_swig:
 	   $(MAKE) -C $$i real_clean ; \
 	done
 
-ifeq ($(USE_ER7_UTILS), 1)
-clean_swig: make_er7_makefiles
-endif
-
 clean_ICG :
 	$(MAKE) -C ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen  clean
 
diff --git a/test/makefile b/test/makefile
index 2936432b..acd3dc17 100644
--- a/test/makefile
+++ b/test/makefile
@@ -8,7 +8,6 @@ COMPILE_DIRS = \
 	SIM_python_namespace \
 	SIM_rti \
 	SIM_stls \
-	SIM_target_specific_variables \
 	SIM_test_dp \
 	SIM_test_dr \
 	SIM_test_io \
@@ -22,6 +21,7 @@ SIMS_NEEDING_TEST = \
 	SIM_demo_inputfile \
 	SIM_measurement_units \
 	SIM_parse_s_define \
+	SIM_target_specific_variables \
 	SIM_test_abstract \
 	SIM_test_inherit \
 	SIM_test_ip2 \
diff --git a/trick_source/er7_utils/.gitignore b/trick_source/er7_utils/.gitignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/trick_source/er7_utils/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/trick_source/er7_utils/common.mk b/trick_source/er7_utils/common.mk
new file mode 100644
index 00000000..82491e1a
--- /dev/null
+++ b/trick_source/er7_utils/common.mk
@@ -0,0 +1,3 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../share/trick/makefiles/Makefile.common
+include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
+-include Makefile_deps
diff --git a/trick_source/er7_utils/integration/abm4/Makefile b/trick_source/er7_utils/integration/abm4/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/abm4/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/beeman/Makefile b/trick_source/er7_utils/integration/beeman/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/beeman/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/core/Makefile b/trick_source/er7_utils/integration/core/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/core/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/euler/Makefile b/trick_source/er7_utils/integration/euler/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/euler/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/mm4/Makefile b/trick_source/er7_utils/integration/mm4/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/mm4/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/nl2/Makefile b/trick_source/er7_utils/integration/nl2/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/nl2/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/position_verlet/Makefile b/trick_source/er7_utils/integration/position_verlet/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/position_verlet/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/rk2_heun/Makefile b/trick_source/er7_utils/integration/rk2_heun/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/rk2_heun/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/rk2_midpoint/Makefile b/trick_source/er7_utils/integration/rk2_midpoint/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/rk2_midpoint/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/rk4/Makefile b/trick_source/er7_utils/integration/rk4/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/rk4/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/rkf45/Makefile b/trick_source/er7_utils/integration/rkf45/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/rkf45/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/rkf78/Makefile b/trick_source/er7_utils/integration/rkf78/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/rkf78/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/rkg4/Makefile b/trick_source/er7_utils/integration/rkg4/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/rkg4/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/rkn4/Makefile b/trick_source/er7_utils/integration/rkn4/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/rkn4/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/symplectic_euler/Makefile b/trick_source/er7_utils/integration/symplectic_euler/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/symplectic_euler/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/integration/velocity_verlet/Makefile b/trick_source/er7_utils/integration/velocity_verlet/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/integration/velocity_verlet/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk
diff --git a/trick_source/er7_utils/interface/Makefile b/trick_source/er7_utils/interface/Makefile
new file mode 100644
index 00000000..790f126b
--- /dev/null
+++ b/trick_source/er7_utils/interface/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../common.mk
diff --git a/trick_source/er7_utils/math/Makefile b/trick_source/er7_utils/math/Makefile
new file mode 100644
index 00000000..790f126b
--- /dev/null
+++ b/trick_source/er7_utils/math/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../common.mk
diff --git a/trick_source/er7_utils/trick/integration/Makefile b/trick_source/er7_utils/trick/integration/Makefile
new file mode 100644
index 00000000..055d567a
--- /dev/null
+++ b/trick_source/er7_utils/trick/integration/Makefile
@@ -0,0 +1 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk