diff --git a/include/as.h b/include/afl-as.h
similarity index 100%
rename from include/as.h
rename to include/afl-as.h
diff --git a/src/afl-as.c b/src/afl-as.c
index 063e3bcd..94595f24 100644
--- a/src/afl-as.c
+++ b/src/afl-as.c
@@ -35,7 +35,7 @@
 #include "debug.h"
 #include "alloc-inl.h"
 
-#include "as.h"
+#include "afl-as.h"
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/test-instr.c b/test-instr.c
similarity index 100%
rename from src/test-instr.c
rename to test-instr.c