headers reordered, gcc warning fixes