Headers fix

This fixes misc things i've seen in header files when compiling against Qt.
Please apply.