Further synchronisation with Unix build. I hadn't noticed pq_compat.h