diff --git a/src/internal.h b/src/internal.h
index cf7e1967131e0612da66d324e1667f3e2d96196a..936cd030207e28b79f38ae943241316d68f2ddc0 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -73,8 +73,14 @@
 #else
 #define __GNUC_PREREQ(maj,min) 0
 #endif
+
+/* Work around broken limits.h on debian etch */
+#if defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX
+#define ULLONG_MAX   ULONG_LONG_MAX
 #endif
 
+#endif /* __GNUC__ */
+
 /**
  * ATTRIBUTE_UNUSED:
  *
diff --git a/src/storage_conf.c b/src/storage_conf.c
index 075279cc0a7639b269620abce933cebf345f2218..245b2d0cc5392fbd63760c7425d8415048eeee5a 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -45,11 +45,6 @@
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
-/* Work around broken limits.h on debian etch */
-#if defined __GNUC__ && defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX
-# define ULLONG_MAX   ULONG_LONG_MAX
-#endif
-
 #define virStorageError(conn, code, fmt...)                             \
             virReportErrorHelper(conn, VIR_FROM_STORAGE, code, __FILE__,\
                                   __FUNCTION__, __LINE__, fmt)