Reorganized the headers somewhat, and removed a temporary define