diff --git a/ChangeLog b/ChangeLog
index bae4cd4cdc87d90573e065f90846e5ee8a788ed2..8d1d8202ee3151b7f691f827b79436bb56dbb0e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+2008-07-11 Michael Haubenwallner <michael.haubenwallner@salomon.at>
+	* global.c: include proto.h earlier in file to fix AIX compilation
+	  (Savannah patch 6559)
+
 2008-07-11 Mitsuya Shibata <mty.shibata@gmail.com>
 	* text.c: Fix crashing in help menu when using certain locales
+	  (Savannah bug 23751)
 
 2008-07-09 Chris Allegretta <chrisa@asty.org>
         * nano.c/nano.h/global.c/text.c: New generalized undo code, currently
diff --git a/src/global.c b/src/global.c
index 7daa9aff5105ec80290bc791c7d13c5c6f8e2810..addb5fe1612bc7e90e87251fc54b55983ea050ec 100644
--- a/src/global.c
+++ b/src/global.c
@@ -21,11 +21,12 @@
  *                                                                        *
  **************************************************************************/
 
+#include "proto.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
 #include "assert.h"
-#include "proto.h"
 
 /* Global variables. */
 #ifndef NANO_TINY