diff --git a/test_problems/ChemEquil_gri_matrix/Makefile.in b/test_problems/ChemEquil_gri_matrix/Makefile.in
index e5dbaa77c..735e2b115 100644
--- a/test_problems/ChemEquil_gri_matrix/Makefile.in
+++ b/test_problems/ChemEquil_gri_matrix/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/ChemEquil_gri_pairs/Makefile.in b/test_problems/ChemEquil_gri_pairs/Makefile.in
index 8b1f5fbe6..dd0332c16 100644
--- a/test_problems/ChemEquil_gri_pairs/Makefile.in
+++ b/test_problems/ChemEquil_gri_pairs/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/DH_graph_1/Makefile.in b/test_problems/cathermo/DH_graph_1/Makefile.in
index 4857919e9..036a495fe 100644
--- a/test_problems/cathermo/DH_graph_1/Makefile.in
+++ b/test_problems/cathermo/DH_graph_1/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in
index ceb8efe3a..aad76411e 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/HMW_graph_GvI/Makefile.in b/test_problems/cathermo/HMW_graph_GvI/Makefile.in
index 4763d3257..32b506a29 100644
--- a/test_problems/cathermo/HMW_graph_GvI/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_GvI/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/HMW_graph_GvT/Makefile.in b/test_problems/cathermo/HMW_graph_GvT/Makefile.in
index 4f0218058..9185dbea3 100644
--- a/test_problems/cathermo/HMW_graph_GvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_GvT/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.in b/test_problems/cathermo/HMW_graph_HvT/Makefile.in
index f4ae6afa2..1edc6d2bf 100644
--- a/test_problems/cathermo/HMW_graph_HvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.in b/test_problems/cathermo/HMW_graph_VvT/Makefile.in
index 89c73e104..3b4b21156 100644
--- a/test_problems/cathermo/HMW_graph_VvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/HMW_test_1/Makefile.in b/test_problems/cathermo/HMW_test_1/Makefile.in
index 49a35854c..194d92a78 100644
--- a/test_problems/cathermo/HMW_test_1/Makefile.in
+++ b/test_problems/cathermo/HMW_test_1/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/HMW_test_3/Makefile.in b/test_problems/cathermo/HMW_test_3/Makefile.in
index 41322be6f..875070cba 100644
--- a/test_problems/cathermo/HMW_test_3/Makefile.in
+++ b/test_problems/cathermo/HMW_test_3/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/ims/Makefile.in b/test_problems/cathermo/ims/Makefile.in
index c64b09ded..ae3906b39 100644
--- a/test_problems/cathermo/ims/Makefile.in
+++ b/test_problems/cathermo/ims/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/issp/Makefile.in b/test_problems/cathermo/issp/Makefile.in
index eeb061c6f..9c4cab9cd 100644
--- a/test_problems/cathermo/issp/Makefile.in
+++ b/test_problems/cathermo/issp/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/testIAPWS/Makefile.in b/test_problems/cathermo/testIAPWS/Makefile.in
index bbff5fa1d..a7362abf9 100755
--- a/test_problems/cathermo/testIAPWS/Makefile.in
+++ b/test_problems/cathermo/testIAPWS/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/testIAPWSPres/Makefile.in b/test_problems/cathermo/testIAPWSPres/Makefile.in
index 7c420e0c2..50de6fae1 100755
--- a/test_problems/cathermo/testIAPWSPres/Makefile.in
+++ b/test_problems/cathermo/testIAPWSPres/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/testIAPWSTripP/Makefile.in b/test_problems/cathermo/testIAPWSTripP/Makefile.in
index 528c66bac..ed593a84c 100755
--- a/test_problems/cathermo/testIAPWSTripP/Makefile.in
+++ b/test_problems/cathermo/testIAPWSTripP/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/testWaterPDSS/Makefile.in b/test_problems/cathermo/testWaterPDSS/Makefile.in
index 6315ac228..92a83eb14 100755
--- a/test_problems/cathermo/testWaterPDSS/Makefile.in
+++ b/test_problems/cathermo/testWaterPDSS/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/cathermo/testWaterTP/Makefile.in b/test_problems/cathermo/testWaterTP/Makefile.in
index 9d7ae78d7..c9a782ace 100644
--- a/test_problems/cathermo/testWaterTP/Makefile.in
+++ b/test_problems/cathermo/testWaterTP/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/diamondSurf/Makefile.in b/test_problems/diamondSurf/Makefile.in
index 5198278f0..0194616a7 100644
--- a/test_problems/diamondSurf/Makefile.in
+++ b/test_problems/diamondSurf/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/fracCoeff/Makefile.in b/test_problems/fracCoeff/Makefile.in
index 9ae17e3d2..815628cf2 100644
--- a/test_problems/fracCoeff/Makefile.in
+++ b/test_problems/fracCoeff/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/min_python/minDiamond/Makefile.in b/test_problems/min_python/minDiamond/Makefile.in
index 3ce3e9edf..f722d2b30 100644
--- a/test_problems/min_python/minDiamond/Makefile.in
+++ b/test_problems/min_python/minDiamond/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/min_python/negATest/Makefile.in b/test_problems/min_python/negATest/Makefile.in
index f916ce05b..089efe1a3 100644
--- a/test_problems/min_python/negATest/Makefile.in
+++ b/test_problems/min_python/negATest/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/negATest/Makefile.in b/test_problems/negATest/Makefile.in
index 3bc866777..2e53ee1ec 100644
--- a/test_problems/negATest/Makefile.in
+++ b/test_problems/negATest/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/silane_equil/Makefile.in b/test_problems/silane_equil/Makefile.in
index 229dd80c5..de4406ff5 100644
--- a/test_problems/silane_equil/Makefile.in
+++ b/test_problems/silane_equil/Makefile.in
@@ -68,7 +68,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 # How to compile the dependency file
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 # List of dependency files to be created
 DEPENDS=$(OBJS:.o=.d)
diff --git a/test_problems/surfkin/Makefile.in b/test_problems/surfkin/Makefile.in
index a0f2304bd..6913e5ec9 100644
--- a/test_problems/surfkin/Makefile.in
+++ b/test_problems/surfkin/Makefile.in
@@ -70,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 DEPENDS=$(OBJS:.o=.d) 
 
 .cpp.d:
-	g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
+	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 
 PROGRAM = $(PROG_NAME)$(EXE_EXT)