Fixed includes and renamed defines.