Fixed some include and headers files.