cleanup inludes and macros for debugging

- minor cleanup to meet overall submodule usage