Refactored for debugging

Changed header-prefixes, refactored include-chain, refactored constant
function-calls