diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
index 6c66e24ba2..6b0cd71bab 100644
--- a/makefiles/Makefile.cpp.mk
+++ b/makefiles/Makefile.cpp.mk
@@ -1,5 +1,4 @@
 # List libraries by module.
-
 BASE_LIBS = \
 	$(LIBPREFIX)util.$(LIBSUFFIX)          \
 	$(LIBPREFIX)base.$(LIBSUFFIX)
@@ -8,7 +7,7 @@ LP_LIBS = \
 	$(LIBPREFIX)linear_solver.$(LIBSUFFIX)
 
 ALGORITHMS_LIBS = \
-	$(LIBPREFIX)algorithms.$(LIBSUFFIX) \
+	$(LIBPREFIX)algorithms.$(LIBSUFFIX)
 
 CP_LIBS = \
 	$(LIBPREFIX)constraint_solver.$(LIBSUFFIX)
@@ -18,9 +17,7 @@ GRAPH_LIBS = \
 	$(LIBPREFIX)shortestpaths.$(LIBSUFFIX)
 
 ROUTING_LIBS = \
-        $(LIBPREFIX)routing.$(LIBSUFFIX) \
-        $(LIBPREFIX)graph.$(LIBSUFFIX) \
-        $(LIBPREFIX)constraint_solver.$(LIBSUFFIX) \
+        $(LIBPREFIX)routing.$(LIBSUFFIX)
 
 # Lib dependencies.
 BASE_DEPS = $(BASE_LIBS)
@@ -33,7 +30,7 @@ CP_DEPS = $(CP_LIBS) $(LP_LIBS) $(BASE_LIBS)
 
 GRAPH_DEPS = $(GRAPH_LIBS) $(BASE_LIBS)
 
-ROUTING_DEPS = $(ROUTING_LIBS) $(CP_LIBS) $(GRAPH_LIBS) $(BASE_LIBS)
+ROUTING_DEPS = $(ROUTING_LIBS) $(CP_LIBS) $(LP_LIBS) $(GRAPH_LIBS) $(BASE_LIBS)
 
 # Create link commands.
 BASE_LNK = \
diff --git a/makefiles/Makefile.unix b/makefiles/Makefile.unix
index 7bf220a835..bd6c3cf36d 100644
--- a/makefiles/Makefile.unix
+++ b/makefiles/Makefile.unix
@@ -116,13 +116,9 @@ JAR_BIN = jar
 PRE_LIB = -L$(TOP) -l
 POST_LIB =
 LIBSUFFIX = dylib
-LINKCMD = ld -arch x86_64 -dylib -flat_namespace -undefined suppress
+LINKCMD = ld -arch x86_64 -dylib -flat_namespace -undefined suppress -macosx_version_min 10.6
 LINKPREFIX = -o # Need the space.
 
-#LIBSUFFIX = a
-#LINKCMD = ar rv
-#LINKPREFIX =
-
 ifdef UNIX_GLPK_DIR
 GLPK_LNK = -L$(UNIX_GLPK_DIR)/lib -lglpk
 endif