moved a couple of includes that should have been in the modules folder