Include cleanup
Merge branch 'master' of https://github.com/kjmac123/metabuilder

Conflicts:
	metabuilder/src/block.cpp
	metabuilder/src/writer_msvc.cpp