Massive cleanup, refactored includes