paperconf.c: tidy up includes