diff --git a/CHANGELOG b/CHANGELOG
index a8f1c43a..987301bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2008-08-26 Simon Goldschmidt
+  * inet.h, ip_addr.h: fixed bug #24132: Cross-dependency between ip_addr.h and
+    inet.h -> moved declaration of struct in_addr from ip_addr.h to inet.h
+
   2008-08-14 Simon Goldschmidt
   * api_msg.c: fixed bug #23847: do_close_internal references freed memory (when
     tcp_close returns != ERR_OK)
diff --git a/src/include/ipv4/lwip/inet.h b/src/include/ipv4/lwip/inet.h
index 1ffcf707..24b75e13 100644
--- a/src/include/ipv4/lwip/inet.h
+++ b/src/include/ipv4/lwip/inet.h
@@ -40,6 +40,11 @@
 extern "C" {
 #endif
 
+/* For compatibility with BSD code */
+struct in_addr {
+  u32_t s_addr;
+};
+
 u32_t inet_addr(const char *cp);
 int inet_aton(const char *cp, struct in_addr *addr);
 char *inet_ntoa(struct in_addr addr); /* returns ptr to static buffer; not reentrant! */
diff --git a/src/include/ipv4/lwip/ip_addr.h b/src/include/ipv4/lwip/ip_addr.h
index 7f243363..12e7eb03 100644
--- a/src/include/ipv4/lwip/ip_addr.h
+++ b/src/include/ipv4/lwip/ip_addr.h
@@ -66,11 +66,6 @@ PACK_STRUCT_END
 #  include "arch/epstruct.h"
 #endif
 
-/* For compatibility with BSD code */
-struct in_addr {
-  u32_t s_addr;
-};
-
 struct netif;
 
 extern const struct ip_addr ip_addr_any;