Moved some headers around to make this easier to use as a subproject.