ICU: do not include ICU headers for definitions only: Windows support

+ code cleanup

Author: Marina Polyakova

src/bin/pg_upgrade/version.c

@@ -11,6 +11,10 @@
 
 #include "pg_upgrade.h"
 
+#if defined(WIN32) && defined(USE_ICU)
+#include <unicode/uloc.h>
+#endif
+
 #include "catalog/pg_class.h"
 #include "catalog/pg_collation.h"
 #include "fe_utils/string_utils.h"

src/port/chklocale.c

@@ -23,14 +23,14 @@
 #include <langinfo.h>
 #endif
 
-#include "catalog/pg_collation.h"
-#include "common/pg_collation_fn_common.h"
-#include "mb/pg_wchar.h"
-
 #ifdef USE_ICU
 #include <unicode/ucol.h>
 #endif
 
+#include "catalog/pg_collation.h"
+#include "common/pg_collation_fn_common.h"
+#include "mb/pg_wchar.h"
+
 /*
  * In backend, we will use palloc/pfree.  In frontend, use malloc/free.
  */