fixed a few problems with the includes