moved includes to a central includes file
some more modifications