Re-sort synopsis, add includes.