diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index da3dae9e250..a4dd233c7f9 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -35,7 +35,6 @@
 #include "common/username.h"
 #include "port/atomics.h"
 #include "postmaster/postmaster.h"
-#include "storage/s_lock.h"
 #include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/help_config.h"
diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h
index c2be198f28e..ad209acfac0 100644
--- a/src/include/storage/condition_variable.h
+++ b/src/include/storage/condition_variable.h
@@ -23,7 +23,7 @@
 #define CONDITION_VARIABLE_H
 
 #include "storage/proclist_types.h"
-#include "storage/s_lock.h"
+#include "storage/spin.h"
 
 typedef struct
 {
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index c04ae971485..af9b41795d2 100644
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -20,7 +20,6 @@
 
 #include "port/atomics.h"
 #include "storage/proclist_types.h"
-#include "storage/s_lock.h"
 
 struct PGPROC;