Fix header macros

some fixes in the includes and removal of Qt specific TRUE and FALSE macros