Moved header include.
First pass at debug macros.