fixed some include issues for compiling