Fixed a few include files