diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 1dad125706e..22822fc68d7 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -22,6 +22,7 @@
 #include "storage/pg_sema.h"
 #include "storage/proclist_types.h"
 #include "storage/procnumber.h"
+#include "storage/spin.h"
 
 /* Avoid including clog.h here */
 typedef int XidStatus;
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 2fccbdb534c..a2eb499d63c 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -21,7 +21,6 @@
 #ifndef SHMEM_H
 #define SHMEM_H
 
-#include "storage/spin.h"
 #include "utils/hsearch.h"