merge, mkcatdefs: add missing includes, clean up trailing whitespace
drwxr-xr-x - cde