diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 205cba3762d..efc3377992f 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -808,9 +808,9 @@ typedef struct PgStat_FunctionCallUsage
  * GUC parameters
  * ----------
  */
-extern bool pgstat_track_activities;
-extern bool pgstat_track_counts;
-extern int	pgstat_track_functions;
+extern PGDLLIMPORT bool pgstat_track_activities;
+extern PGDLLIMPORT bool pgstat_track_counts;
+extern PGDLLIMPORT int pgstat_track_functions;
 extern PGDLLIMPORT int pgstat_track_activity_query_size;
 extern char *pgstat_stat_directory;
 extern char *pgstat_stat_tmpname;
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index ec34cfd2198..d2077d85c7c 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -224,8 +224,8 @@ extern PGPROC *PreparedXactProcs;
 
 /* configurable options */
 extern PGDLLIMPORT int DeadlockTimeout;
-extern int	StatementTimeout;
-extern int	LockTimeout;
+extern PGDLLIMPORT int StatementTimeout;
+extern PGDLLIMPORT int LockTimeout;
 extern bool log_lock_waits;