diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index d689b527197..050ad269e50 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -951,9 +951,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 e359994aebd..239ed023958 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -258,9 +258,9 @@ extern PGPROC *PreparedXactProcs;
 
 /* configurable options */
 extern PGDLLIMPORT int DeadlockTimeout;
-extern int	StatementTimeout;
-extern int	LockTimeout;
-extern int	IdleInTransactionSessionTimeout;
+extern PGDLLIMPORT int StatementTimeout;
+extern PGDLLIMPORT int LockTimeout;
+extern PGDLLIMPORT int IdleInTransactionSessionTimeout;
 extern bool log_lock_waits;