Tidy: Sort/move/tidy #include in many files, correct template line end space