diff --git a/Userland/Makefile b/Userland/Makefile
index 843d33d9a4..2188d72adb 100644
--- a/Userland/Makefile
+++ b/Userland/Makefile
@@ -6,13 +6,17 @@ EXTRA_CLEAN = $(APPS)
 
 LIB_DEPS = HTML GUI Draw Audio Protocol IPC Thread Pthread Core PCIDB Markdown
 
-all: $(OBJS) $(APPS)
+include ../Makefile.common
+
+all: $(APPS)
 
 list:
 	@echo $(APPS)
 
-$(APPS): %: %.o $(OBJS)
+%.o: %.cpp
+	@echo "C++ $@"
+	$(QUIET) $(CXX) $(CXXFLAGS) -o $@ -c $<
+
+$(APPS): %: %.o $(STATIC_LIB_DEPS)
 	@echo "LINK $@"
 	$(QUIET) $(CXX) -o $@ $< $(LDFLAGS)
-
-include ../Makefile.common