fix include bugs