Corrected include bugs