standardize includes and versions, etc.