Massive cleanup of old includes. Indentation cleanup.
Massive cleanup of old includes. Indentation cleanup.

omonar/modern,omonar/modern,OverByThere/modern,omonar/modern,OverByThere/modern,OverByThere/modern