ean up some broken include file ordering