Fixed some include bugs