diff --git a/Makefile.am b/Makefile.am
index f10e3c70..53160da6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,14 +16,17 @@ dist_music_DATA = music/hr3-caves.ogg music/hr3-desert.ogg music/hr3-hell.ogg mu
 soundsdir=$(datadir)/hyperrogue/sounds
 dist_sounds_DATA = sounds/*
 
-noinst_PROGRAMS = langen
-langen_SOURCES = langen.cpp 
+noinst_PROGRAMS = langen makeh
+langen_SOURCES = langen.cpp makeh.cpp
 langen_CXXFLAGS = -O0 -std=c++11 ${AM_CXXFLAGS}
 BUILT_SOURCES = language-data.cpp
 
 language-data.cpp: langen
 	./langen > language-data.cpp
 
+autohdr.h: makeh *.cpp
+	./makeh locations.cpp hyperpoint.cpp geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp *.cpp > autohdr.h
+
 #############################
 # Platform specific setup
 #############################
diff --git a/Makefile.simple b/Makefile.simple
index b63dc047..581d2f98 100644
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -155,6 +155,12 @@ hyper.res: hyper.rc hr-icon.ico
 langen$(EXE_EXTENSION): langen.cpp language-??.cpp language-ptbr.cpp
 	$(CXX) -O0 $(CXXFLAGS) $(langen_CXXFLAGS) langen.cpp $(LDFLAGS) -o $@
 
+makeh$(EXE_EXTENSION): makeh.cpp
+	$(CXX) makeh.cpp -o $@
+
+autohdr.h: makeh$(EXE_EXTENSION) *.cpp
+	./makeh locations.cpp hyperpoint.cpp geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp *.cpp > autohdr.h
+
 language-data.cpp: langen$(EXE_EXTENSION)
 	./langen > language-data.cpp