include/library reformat