Format and organize includes