Fixed include order

Given header file.h, it is good practice to have a file file.cpp
that includes it as first header.

I just fix the order of includes here. There are still several
headers which do not have a corresponding cpp file, and also
a few that are not included anywhere (which is obviosuly an error).

I will fix them in a later commit.