diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c
index 26bbabe46f..705e89ee0d 100644
--- a/contrib/miscutil/misc_utils.c
+++ b/contrib/miscutil/misc_utils.c
@@ -13,8 +13,6 @@
 
 #include <unistd.h>
 #include <signal.h>
-#include <string.h>
-#include <errno.h>
 
 #include "access/heapam.h"
 #include "access/htup.h"
@@ -27,7 +25,6 @@
 #include "fmgr.h"
 #include "storage/lmgr.h"
 #include "utils/fmgroids.h"
-#include "utils/palloc.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
 
diff --git a/contrib/tsearch2/rewrite.c b/contrib/tsearch2/rewrite.c
index d5bc0f6e6e..ac42f2c9a9 100644
--- a/contrib/tsearch2/rewrite.c
+++ b/contrib/tsearch2/rewrite.c
@@ -10,11 +10,9 @@
 #include "access/gist.h"
 #include "access/itup.h"
 #include "access/rtree.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
+#include "storage/bufpage.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
-#include "storage/bufpage.h"
 
 #include "query.h"
 #include "rewrite.h"