working includes

.h files should no longer cause problems