388.02 Cleaning up refactoring, include files