[Code Cleanup] Cleaned up some header files and move a bit of debugging logic to cmake

[Code Cleanup] Cleaned up some header files and move a bit of debugging logic to cmake #5024