diff --git a/assembler/Makefile b/assembler/Makefile
index b7ee329..af647b6 100644
--- a/assembler/Makefile
+++ b/assembler/Makefile
@@ -34,7 +34,8 @@ assembler: $(OBJ_FILES)
 tester:
 	$(CC) $(CFLAGS) tests/test.c -o $(TEST_OUT)
 
-%.o: %.c $(CC) $(CFLAGS) $(WARNINGS) -o $@ -c $<
+%.o: %.c
+	$(CC) $(CFLAGS) $(WARNINGS) -o $@ -c $<
 
 check: assembler tester
 	@echo "RUNNING TESTS"
diff --git a/assembler/src/main.c b/assembler/src/main.c
index bbdeaac..f2b9042 100644
--- a/assembler/src/main.c
+++ b/assembler/src/main.c
@@ -1,7 +1,7 @@
 /* An assembler for the gol-16 assembly language (g-asm) */
-#include "conversion/analyzer.h"
-#include "conversion/instructions.h"
-#include "conversion/lexer.h"
+#include "analyzer.h"
+#include "instructions.h"
+#include "lexer.h"
 #include <stdio.h>
 #include <stdlib.h>