Improved formatting somewhat, added "poor man's include" in preparation
for actual includes.