diff --git a/Makefile b/Makefile
index 95b7848..3b0a161 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@
 
 default: remontel.ulx remontel.z5
 
-remontel.ulx: remontel.inf *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform -G +include_path=,lib $<
+remontel.ulx: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform -G +include_path=,includes,lib $<
 
-remontel.z5: remontel.inf *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform +include_path=,lib $<
+remontel.z5: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform +include_path=,includes,lib $<
 
 lib/Parser.h lib/VerbLib.h lib/Grammar.h:
 	$(MAKE) -C lib Parser.h
diff --git a/Characters.inf b/includes/Characters.inf
similarity index 100%
rename from Characters.inf
rename to includes/Characters.inf
diff --git a/Classes.inf b/includes/Classes.inf
similarity index 100%
rename from Classes.inf
rename to includes/Classes.inf
diff --git a/Globals.inf b/includes/Globals.inf
similarity index 100%
rename from Globals.inf
rename to includes/Globals.inf
diff --git a/Items.inf b/includes/Items.inf
similarity index 100%
rename from Items.inf
rename to includes/Items.inf
diff --git a/MoreVerbs.inf b/includes/MoreVerbs.inf
similarity index 100%
rename from MoreVerbs.inf
rename to includes/MoreVerbs.inf
diff --git a/Rooms.inf b/includes/Rooms.inf
similarity index 100%
rename from Rooms.inf
rename to includes/Rooms.inf