Here is a small patch to reorder header files in postgres_fdw.c andconnection.c in alphabetical order.
Best regards,Etsuro Fujita