tried to fix some problems with header files