Minor fixes

collected during switch to clang, but unrelated. Wanna merge them separately. Have a closer look at a304e27fa735385b5c1432dfdda66d42f734aad7


Any valid source of orogen_include should give all necessary includes, never partial ones. If you have a problem with the #set, it really means that you generate wrong orogen_include somewhere, and are hiding it with this change.