Don't include wait_event.h in pgstat.h

Don't include proc.h in shm_mq.h

Don't include latch.h in libpq/libpq.h

Reduce includes in pgstat.h

Avoid including utils/timestamp.h in conflict.h.