diff --git a/lib-src/pop.c b/lib-src/pop.c
index db6e7638990..dc48e2ddcc3 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1565,9 +1565,10 @@ find_crlf (char *in_string, int len)
 /* The following 2 functions are only available since XP, so we load
    them dynamically and provide fallbacks.  */
 
-int (WINAPI *pfn_getaddrinfo) (const char *, const char *,
-			       const struct addrinfo *, struct addrinfo **);
-void (WINAPI *pfn_freeaddrinfo) (struct addrinfo *);
+static int (WINAPI *pfn_getaddrinfo) (const char *, const char *,
+				      const struct addrinfo *,
+				      struct addrinfo **);
+static void (WINAPI *pfn_freeaddrinfo) (struct addrinfo *);
 
 static int
 load_ws2 (void)
diff --git a/src/treesit.c b/src/treesit.c
index 67dd2ee3a7a..7fbe331c234 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -937,7 +937,7 @@ void treesit_debug_print_linecol (struct ts_linecol);
 void
 treesit_debug_print_linecol (struct ts_linecol linecol)
 {
-  printf ("{ line=%ld col=%ld bytepos=%ld }\n", linecol.line, linecol.col, linecol.bytepos);
+  printf ("{ line=%td col=%td bytepos=%td }\n", linecol.line, linecol.col, linecol.bytepos);
 }
 
 /* Returns true if BUF tracks linecol.  */
diff --git a/src/w32fns.c b/src/w32fns.c
index 493f33486fb..fd64b04691d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -266,6 +266,7 @@ extern AppendMenuW_Proc unicode_append_menu;
 static int ignore_ime_char = 0;
 
 /* W95 mousewheel handler */
+extern unsigned int msh_mousewheel;
 unsigned int msh_mousewheel = 0;
 
 /* Timers */