Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 7ca51cc042eeb097f77682bee8ca72552776c00b)
+++ uspace/Makefile.common	(revision 1bf924a712914209ed4a3f88a864d9b78d07c18b)
@@ -273,6 +273,8 @@
 	# XXX: Do not change the order of arguments.
 	CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
+	CXX_JOB = $(JOBFILE) $(JOB) $(CXX) $< -o $@
 else
 	CC_JOB = $(CC) $< -o $@
+	CXX_JOB = $(CXX) $< -o $@
 endif
 
@@ -380,5 +382,11 @@
 
 %.o: %.cpp | depend
-	$(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -c $< -o $@
+	$(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
+
+%.o: %.cxx | depend
+	$(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
+
+%.o: %.cc | depend
+	$(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
 
 %.test.o: %.c | depend
@@ -395,5 +403,11 @@
 
 %.lo: %.cpp | depend
-	$(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -c $< -o $@
+	$(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
+
+%.lo: %.cxx | depend
+	$(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
+
+%.lo: %.cc | depend
+	$(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
 
 -include $(DEPENDS)