diff --git a/Makefile b/Makefile
index 62f95b9..24f42a5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ CC=cc
 
 DIST=build
 OUT=$(DIST)/arl.out
+MODULES=main lib/vec lib/sv parser/ast parser/parser
+OBJECTS:=$(patsubst %,$(DIST)/%.o, $(MODULES))
 
 LDFLAGS=
 GFLAGS=-Wall -Wextra -Wpedantic -std=c23 -I./src/
@@ -15,27 +17,26 @@ else
 CFLAGS=$(GFLAGS) $(DFLAGS)
 endif
 
-HEADERS=$(shell find "src" -type 'f' -name '*.h')
-MODULES=main lib/vec lib/sv parser/ast parser/parser
-OBJECTS=$(patsubst %,$(DIST)/%.o, $(MODULES))
+# Dependency generation
+DEPFLAGS=-MT $@ -MMD -MP -MF
+DEPDIR=$(DIST)/deps
 
 $(OUT): $(OBJECTS) | $(DIST)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
-$(DIST)/%.o: src/arl/%.c $(HEADERS) | $(DIST)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(DIST)/%.o: src/arl/parser/%.c $(HEADERS) | $(DIST)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(DIST)/%.o: src/arl/lib/%.c $(HEADERS) | $(DIST)
-	$(CC) $(CFLAGS) -c -o $@ $<
+$(DIST)/%.o: src/arl/%.c | $(DIST) $(DEPDIR)
+	$(CC) $(CFLAGS) $(DEPFLAGS) $(DEPDIR)/$*.d -c -o $@ $<
 
 $(DIST):
 	mkdir -p $(DIST)
 	mkdir -p $(DIST)/lib
 	mkdir -p $(DIST)/parser
 
+$(DEPDIR):
+	mkdir -p $(DEPDIR)
+	mkdir -p $(DEPDIR)/lib
+	mkdir -p $(DEPDIR)/parser
+
 .PHONY: run clean
 ARGS=
 run: $(OUT)
@@ -43,3 +44,6 @@ run: $(OUT)
 
 clean:
 	rm -rf $(DIST)
+
+DEPS:=$(patsubst %,$(DEPDIR)/%.d, $(MODULES))
+include $(wildcard $(DEPS))