fixed include bugs