change header imports for submodules and comment out already defined debug logs