fix wrong forward declaration
modify include files according to the name change of the file