Removed dysfunctional includes. Need to be re-done properly when finally implementing SITL. No use to leave untested stuff in tree.