Also fix a race between includes: util.inc should come first.
Attach a file by drag & drop or click to upload
