fixed includes and version