3 files changed, 3 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 142ede7d681..82ab1e62541 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
         * lisp.h (Fread_file_name): Do not EXFUN it.
         * composite.c (CHAR_COMPOSABLE_P): Replace unsafe macro with ...
         (char_composable_p): ... static function.  All users changed.
+        * eval.c (toplevel): Remove redundant #include directives.
+        * xterm.c (x_initialize): Add static to match prototype.
 
 2014-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/eval.c b/src/eval.c
index a96d413d09f..7d54ddb18f5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -27,11 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "commands.h"
 #include "keyboard.h"
 #include "dispextern.h"
-#include "frame.h"              /* For XFRAME.  */
-
-#if HAVE_X_WINDOWS
-#include "xterm.h"
-#endif
 
 /* Chain of condition and catch handlers currently in effect.  */
 
diff --git a/src/xterm.c b/src/xterm.c
index a5f6ae7d0ab..530bfe63dcb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10568,7 +10568,7 @@ x_create_terminal (struct x_display_info *dpyinfo)
   return terminal;
 }
 
-void
+static void
 x_initialize (void)
 {
   baud_rate = 19200;