diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a5504a9c00..2abae432df 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-10  Christian Biesinger  <cbiesinger@google.com>
+
+	* mi/mi-cmd-var.c (varobjdebug): Remove declaration.
+	* varobj.c (varobjdebug): Move comment to...
+	* varobj.h (varobjdebug): ...here, and declare.
+
 2019-10-09  Tom Tromey  <tom@tromey.com>
 
 	* tui/tui-regs.c (tui_data_window::show_registers): Don't call
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index f5219e0f9b..d1de382af7 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -33,8 +33,6 @@
 #include "gdbsupport/gdb_optional.h"
 #include "inferior.h"
 
-extern unsigned int varobjdebug;		/* defined in varobj.c.  */
-
 static void varobj_update_one (struct varobj *var,
 			       enum print_values print_values,
 			       bool is_explicit);
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 809006827f..827a1b0c0f 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -40,7 +40,7 @@
 typedef int PyObject;
 #endif
 
-/* Non-zero if we want to see trace of varobj level stuff.  */
+/* See varobj.h.  */
 
 unsigned int varobjdebug = 0;
 static void
diff --git a/gdb/varobj.h b/gdb/varobj.h
index 9067d2d6be..8f00d780d4 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -235,6 +235,11 @@ extern const struct lang_varobj_ops cplus_varobj_ops;
 extern const struct lang_varobj_ops ada_varobj_ops;
 
 #define default_varobj_ops c_varobj_ops
+
+/* Non-zero if we want to see trace of varobj level stuff.  */
+
+extern unsigned int varobjdebug;
+
 /* API functions */
 
 extern struct varobj *varobj_create (const char *objname,