5 files changed, 9 insertions, 3 deletions

diff --git a/src/image.c b/src/image.c
index e93fc3183af..3138ef25a63 100644
--- a/src/image.c
+++ b/src/image.c
@@ -12744,7 +12744,7 @@ static struct image_type const image_types[] =
 };
 
 #if HAVE_NATIVE_IMAGE_API
-struct image_type native_image_type =
+static struct image_type native_image_type =
   { SYMBOL_INDEX (Qnative_image), native_image_p, native_image_load,
     image_clear_image };
 #endif
diff --git a/src/keyboard.c b/src/keyboard.c
index dff86bbca13..d5892115e4b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5396,6 +5396,10 @@ static const char *const lispy_kana_keys[] =
 
 /* You'll notice that this table is arranged to be conveniently
    indexed by X Windows keysym values.  */
+#ifdef HAVE_NS
+/* FIXME: Why are we using X11 keysym values for NS?  */
+static
+#endif
 const char *const lispy_function_keys[] =
   {
     /* X Keysym value */
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 0d21f7d03d3..46ee9e1c3fc 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -47,7 +47,6 @@ Carbon version by Yamamoto Mitsuharu. */
 #endif
 
 
-extern long context_menu_value;
 EmacsMenu *svcsMenu;
 /* Nonzero means a menu is currently active.  */
 static int popup_activated_flag;
diff --git a/src/nsterm.h b/src/nsterm.h
index ae940ec5b4f..3a713f8e8c9 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -921,6 +921,8 @@ struct ns_display_info
 /* This is a chain of structures for all the NS displays currently in use.  */
 extern struct ns_display_info *x_display_list;
 
+extern long context_menu_value;
+
 struct ns_output
 {
 #ifdef __OBJC__
@@ -1269,6 +1271,8 @@ extern void ns_finish_events (void);
 
 extern double ns_frame_scale_factor (struct frame *);
 
+extern frame_parm_handler ns_frame_parm_handlers[];
+
 #ifdef NS_IMPL_GNUSTEP
 extern char gnustep_base_version[];  /* version tracking */
 #endif
diff --git a/src/nsterm.m b/src/nsterm.m
index f26cdb17903..794630de1c1 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5438,7 +5438,6 @@ ns_flush_display (struct frame *f)
    redisplay interface.  In addition, many of the ns_ methods have
    code that is shared with all terms, indicating need for further
    refactoring.  */
-extern frame_parm_handler ns_frame_parm_handlers[];
 static struct redisplay_interface ns_redisplay_interface =
 {
   ns_frame_parm_handlers,