clean up some includes