Fixed pointer warning, reordered #includes.