diff --git a/test_problems/ChemEquil_gri_pairs/Makefile.in b/test_problems/ChemEquil_gri_pairs/Makefile.in
index f3edb285e..960309deb 100644
--- a/test_problems/ChemEquil_gri_pairs/Makefile.in
+++ b/test_problems/ChemEquil_gri_pairs/Makefile.in
@@ -51,6 +51,8 @@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # flags passed to the C++ compiler/linker for the linking step
 LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
@@ -70,7 +72,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM)
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/ChemEquil_ionizedGas/Makefile.in b/test_problems/ChemEquil_ionizedGas/Makefile.in
index 6bbae1e66..a36be6324 100644
--- a/test_problems/ChemEquil_ionizedGas/Makefile.in
+++ b/test_problems/ChemEquil_ionizedGas/Makefile.in
@@ -54,6 +54,8 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 
@@ -76,7 +78,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM)
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
+$(PROGRAM): $(OBJS)  $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/mixGasTransport/Makefile.in b/test_problems/mixGasTransport/Makefile.in
index 5c3667a9b..44634008b 100644
--- a/test_problems/mixGasTransport/Makefile.in
+++ b/test_problems/mixGasTransport/Makefile.in
@@ -48,6 +48,8 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx 
 
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 
@@ -72,7 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 all: $(PROGRAM)
 
 # Rule to make the program
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a 
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/multiGasTransport/Makefile.in b/test_problems/multiGasTransport/Makefile.in
index 3237c2f4b..19b44080d 100644
--- a/test_problems/multiGasTransport/Makefile.in
+++ b/test_problems/multiGasTransport/Makefile.in
@@ -49,16 +49,7 @@ CANTERA_LIBDIR=@buildlib@
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx 
 
 # Cantera library Dependencies
-CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/liboneD.a \
-                   $(CANTERA_LIBDIR)/libzeroD.a \
-                   $(CANTERA_LIBDIR)/libkinetics.a \
-                   $(CANTERA_LIBDIR)/libtransport.a \
-		   $(CANTERA_LIBDIR)/libthermo.a \
-                   $(CANTERA_LIBDIR)/libctnumerics.a \
-                   $(CANTERA_LIBDIR)/libctbase.a \
-                   $(CANTERA_LIBDIR)/libctmath.a \
-                   $(CANTERA_LIBDIR)/libtpx.a \
-                   $(CANTERA_LIBDIR)/libconverters.a 
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
 
 ifeq (@build_lapack@, 1)
 CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \
diff --git a/test_problems/surfkin/Makefile.in b/test_problems/surfkin/Makefile.in
index c4b27651b..121ed2127 100644
--- a/test_problems/surfkin/Makefile.in
+++ b/test_problems/surfkin/Makefile.in
@@ -49,7 +49,7 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS =  @LOCAL_LIBS@ -lctcxx
 
-CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
 
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
@@ -63,7 +63,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
 
 DEPENDS=$(OBJS:.o=.d) 
 
-%.d: Makefile %.o
+%.d: %.o
 	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
 
@@ -71,7 +71,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) 
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)