Minor include fixes
Merging two branches