diff --git a/src/backend/port/nextstep/dynloader.c b/src/backend/port/dynloader/nextstep.c
similarity index 100%
rename from src/backend/port/nextstep/dynloader.c
rename to src/backend/port/dynloader/nextstep.c
diff --git a/src/backend/port/nextstep/port-protos.h b/src/backend/port/dynloader/nextstep.h
similarity index 77%
rename from src/backend/port/nextstep/port-protos.h
rename to src/backend/port/dynloader/nextstep.h
index 9dfb20a99e4..dfd72a83a69 100644
--- a/src/backend/port/nextstep/port-protos.h
+++ b/src/backend/port/dynloader/nextstep.h
@@ -12,10 +12,10 @@
 #include "fmgr.h"				/* for func_ptr */
 #include "utils/dynamic_loader.h"
 
-void	   *next_dlopen(char *name);
-int			next_dlclose(void *handle);
-void	   *next_dlsym(void *handle, char *symbol);
-char	   *next_dlerror(void);
+void	*next_dlopen(char *name);
+int	next_dlclose(void *handle);
+void	*next_dlsym(void *handle, char *symbol);
+char	*next_dlerror(void);
 
 #define pg_dlopen(f)	next_dlopen
 #define pg_dlsym		next_dlsym