Fixing include bugs