fixed some include issues to make sure the basic functionality works