fixed the includes

there were files that were including each other in some insane fashion