2 files changed, 9 insertions, 8 deletions
diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c
index f0bdcbcf..11a92033 100644
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -22,13 +22,14 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <errno.h>
+#include <time.h>
 #include <string.h>
+#include <limits.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <time.h>
-#include <errno.h>
 #include <download.h>
 
 /* libalpm */
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 5b6fac99..3154f470 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -27,20 +27,20 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <libintl.h> /* here so it doesn't need to be included elsewhere */
 #include <time.h>
 
-#define FREE(p) do { if (p) { free(p); p = NULL; } } while(0)
-
-#define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
-
-/* define _() as shortcut for gettext() */
 #ifdef ENABLE_NLS
+#include <libintl.h> /* here so it doesn't need to be included elsewhere */
+/* define _() as shortcut for gettext() */
 #define _(str) dgettext ("libalpm", str)
 #else
 #define _(s) s
 #endif
 
+#define FREE(p) do { if (p) { free(p); p = NULL; } } while(0)
+
+#define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
+
 int _alpm_makepath(const char *path);
 int _alpm_copyfile(const char *src, const char *dest);
 char *_alpm_strtrim(char *str);