remove unneeded includes and add -Wall