Get rid of some extraneous includes, organize others