- also sort includes - also two whitespace changes
Avoid to include ui generated header files within other header files but use forward declarations instead. This reduces dependencies between files and compile time considerably
The numbering was somewhat artificial.
