fixing include stuff
merge