12 files changed, 23 insertions, 21 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 8254d610999..a2c0ec0b7ff 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -28,7 +28,8 @@
 
 #include "libpq-fe.h"
 #include "pqexpbuffer.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
+#include "fe_utils/print.h"
 #include "fe_utils/string_utils.h"
 
 #include "common.h"
@@ -39,7 +40,6 @@
 #include "input.h"
 #include "large_obj.h"
 #include "mainloop.h"
-#include "fe_utils/print.h"
 #include "psqlscanslash.h"
 #include "settings.h"
 #include "variables.h"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index bd284446f8d..9579e106304 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -6,7 +6,6 @@
  * src/bin/psql/common.c
  */
 #include "postgres_fe.h"
-#include "common.h"
 
 #include <ctype.h>
 #include <limits.h>
@@ -19,15 +18,16 @@
 #include <win32.h>
 #endif
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
+#include "fe_utils/mbprint.h"
 #include "fe_utils/string_utils.h"
 #include "portability/instr_time.h"
 
-#include "settings.h"
 #include "command.h"
+#include "common.h"
 #include "copy.h"
 #include "crosstabview.h"
-#include "fe_utils/mbprint.h"
+#include "settings.h"
 
 
 static bool DescribeQuery(const char *query, double *elapsed_msec);
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index def177693ed..b02177a5c2a 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -24,7 +24,7 @@
 #include "prompt.h"
 #include "stringutils.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 /*
  * parse_slash_copy
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
index 6afd3e0939c..390f750c412 100644
--- a/src/bin/psql/crosstabview.c
+++ b/src/bin/psql/crosstabview.c
@@ -13,7 +13,7 @@
 #include "psqlscanslash.h"
 #include "settings.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 /*
  * Value/position from the resultset that goes into the horizontal or vertical
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index ee00c5da08a..773107227dd 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -18,13 +18,14 @@
 #include "catalog/pg_cast_d.h"
 #include "catalog/pg_class_d.h"
 #include "catalog/pg_default_acl_d.h"
-#include "fe_utils/logging.h"
+
+#include "common/logging.h"
+#include "fe_utils/mbprint.h"
+#include "fe_utils/print.h"
 #include "fe_utils/string_utils.h"
 
 #include "common.h"
 #include "describe.h"
-#include "fe_utils/mbprint.h"
-#include "fe_utils/print.h"
 #include "settings.h"
 #include "variables.h"
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index d6d41b51d53..5fb1baadc57 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -21,15 +21,15 @@
 #include <termios.h>
 #endif
 
-#include "common.h"
+#include "common/logging.h"
 #include "common/username.h"
+
+#include "common.h"
 #include "help.h"
 #include "input.h"
 #include "settings.h"
 #include "sql_help.h"
 
-#include "fe_utils/logging.h"
-
 /*
  * PLEASE:
  * If you change something in this file, also make the same changes
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 93c0d4c49e4..5a18ac9bbc4 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -18,7 +18,7 @@
 #include "tab-complete.h"
 #include "common.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 #ifndef WIN32
 #define PSQLHISTORY ".psql_history"
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index cecb4897f5a..2713f15d4f3 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -11,7 +11,7 @@
 #include "settings.h"
 #include "common.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2);
 
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 3ae447041fa..e386d9888d7 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -14,7 +14,7 @@
 #include "prompt.h"
 #include "settings.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 #include "mb/pg_wchar.h"
 
 
diff --git a/src/bin/psql/psqlscanslash.l b/src/bin/psql/psqlscanslash.l
index f7818e6e603..c2e3bfe9d0c 100644
--- a/src/bin/psql/psqlscanslash.l
+++ b/src/bin/psql/psqlscanslash.l
@@ -19,8 +19,8 @@
 #include "postgres_fe.h"
 
 #include "psqlscanslash.h"
+#include "common/logging.h"
 #include "fe_utils/conditional.h"
-#include "fe_utils/logging.h"
 
 #include "libpq-fe.h"
 }
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 855133bbcb4..7c5b45f7cce 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -16,14 +16,15 @@
 
 #include "getopt_long.h"
 
+#include "common/logging.h"
+#include "fe_utils/print.h"
+
 #include "command.h"
 #include "common.h"
 #include "describe.h"
 #include "help.h"
 #include "input.h"
 #include "mainloop.h"
-#include "fe_utils/logging.h"
-#include "fe_utils/print.h"
 #include "settings.h"
 
 
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 5d47d5a8ab0..e456b9db2f8 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -10,7 +10,7 @@
 #include "common.h"
 #include "variables.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 
 /*