diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index e7e8059a38..72755b064d 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -56,8 +56,6 @@
 #include "common/restricted_token.h"
 #include "storage/large_object.h"
 #include "pg_getopt.h"
-#include "replication/logical.h"
-#include "replication/origin.h"
 
 
 static ControlFileData ControlFile;		/* pg_control values */
diff --git a/src/bin/pg_xlogdump/rmgrdesc.c b/src/bin/pg_xlogdump/rmgrdesc.c
index 2205d6e689..5b88a8dd67 100644
--- a/src/bin/pg_xlogdump/rmgrdesc.c
+++ b/src/bin/pg_xlogdump/rmgrdesc.c
@@ -25,6 +25,7 @@
 #include "commands/dbcommands_xlog.h"
 #include "commands/sequence.h"
 #include "commands/tablespace.h"
+#include "replication/origin.h"
 #include "rmgrdesc.h"
 #include "storage/standby.h"
 #include "utils/relmapper.h"
diff --git a/src/include/replication/origin.h b/src/include/replication/origin.h
index 5d294de60e..8cec43410f 100644
--- a/src/include/replication/origin.h
+++ b/src/include/replication/origin.h
@@ -10,9 +10,11 @@
 #ifndef PG_ORIGIN_H
 #define PG_ORIGIN_H
 
+#include "fmgr.h"
+#include "access/xlog.h"
 #include "access/xlogdefs.h"
+#include "access/xlogreader.h"
 #include "catalog/pg_replication_origin.h"
-#include "replication/logical.h"
 
 typedef struct xl_replorigin_set
 {