Fixed includes and some decls following include-what-you-need  usage