diff --git a/Makefile b/Makefile
index 34f1279..a135d3e 100644
--- a/Makefile
+++ b/Makefile
@@ -85,44 +85,15 @@ build/%.o: %.c
 	@echo "Compile C $<"
 	@gcc $(CFLAGS) -c $< -o $@
 
-build/kernel/%.o: kernel/%.cpp | _bd
+build/%.o: %.cpp
 	@echo "Compile CPP $<"
 	@g++ $(KERNEL_CXXFLAGS) -c $< -o $@
 
-build/kernel/memory/%.o: kernel/memory/%.cpp | _bd
-	@echo "Compile CPP $<"
-	@g++ $(KERNEL_CXXFLAGS) -c $< -o $@
-
-build/kernel/scheduler/%.o: kernel/scheduler/%.cpp | _bd
-	@echo "Compile CPP $<"
-	@g++ $(KERNEL_CXXFLAGS) -c $< -o $@
-
-build/kernel/scheduler/%.o: kernel/scheduler/%.S | _bd
+build/%.o: %.S
 	@echo "Compile AS $<"
 	@gcc -Iinclude -Iefi/inc -ffreestanding -fno-stack-protector -fno-stack-check \
 	    -fshort-wchar -mno-red-zone -fcf-protection=none -c $< -o $@
 
-build/kernel/interrupt/%.o: kernel/interrupt/%.cpp | _bd
-	@echo "Compile CPP $<"
-	@g++ $(KERNEL_CXXFLAGS) -c $< -o $@
-
-build/kernel/interrupt/%.o: kernel/interrupt/%.S | _bd
-	@echo "Compile AS $<"
-	@gcc -Iinclude -Iefi/inc -ffreestanding -fno-stack-protector -fno-stack-check \
-	    -fshort-wchar -mno-red-zone -fcf-protection=none -c $< -o $@
-
-build/graphics/%.o: graphics/%.cpp | _bd
-	@echo "Compile CPP $<"
-	@g++ $(KERNEL_CXXFLAGS) -c $< -o $@
-
-build/fonts/%.o: fonts/%.cpp | _bd
-	@echo "Compile CPP $<"
-	@g++ $(KERNEL_CXXFLAGS) -c $< -o $@
-
-build/desktop/%.o: desktop/%.cpp | _bd
-	@echo "Compile CPP $<"
-	@g++ $(KERNEL_CXXFLAGS) -c $< -o $@
-
 vdir: all
 	@mkdir -p vdir/EFI/BOOT
 	@cp build/BOOTX64.EFI vdir/EFI/BOOT