diff --git a/CHANGELOG b/CHANGELOG
index 96534fe1..8e447fc4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -596,6 +596,10 @@ HISTORY
 
   ++ Bug fixes:
 
+  2008-03-04 Kieran Mansley (contributions by others) 
+  * Numerous small compiler error/warning fixes from contributions to
+    mailing list after 1.3.0 release candidate made.
+
   2008-01-25 Cui hengbin (integrated by Frédéric Bernon)
   * dns.c: Fix bug #22108 "DNS problem" caused by unaligned structures.
 
diff --git a/src/core/dhcp.c b/src/core/dhcp.c
index 28b80326..5d1395eb 100644
--- a/src/core/dhcp.c
+++ b/src/core/dhcp.c
@@ -100,7 +100,9 @@ static err_t dhcp_discover(struct netif *netif);
 static err_t dhcp_select(struct netif *netif);
 static void dhcp_check(struct netif *netif);
 static void dhcp_bind(struct netif *netif);
+#if DHCP_DOES_ARP_CHECK
 static err_t dhcp_decline(struct netif *netif);
+#endif
 static err_t dhcp_rebind(struct netif *netif);
 static void dhcp_set_state(struct dhcp *dhcp, u8_t new_state);
 
diff --git a/src/core/ipv4/inet_chksum.c b/src/core/ipv4/inet_chksum.c
index 0ba1a3e1..1ad15a9b 100644
--- a/src/core/ipv4/inet_chksum.c
+++ b/src/core/ipv4/inet_chksum.c
@@ -36,6 +36,8 @@
  *
  */
 
+#include <string.h>
+
 #include "lwip/opt.h"
 
 #include "lwip/inet_chksum.h"
diff --git a/src/netif/etharp.c b/src/netif/etharp.c
index 6ac82047..070b9139 100644
--- a/src/netif/etharp.c
+++ b/src/netif/etharp.c
@@ -85,7 +85,7 @@
 #define ARPH_PROTOLEN_SET(hdr, len) (hdr)->_hwlen_protolen = htons((len) | (ARPH_HWLEN(hdr) << 8))
 
 enum etharp_state {
-  ETHARP_STATE_EMPTY,
+  ETHARP_STATE_EMPTY = 0,
   ETHARP_STATE_PENDING,
   ETHARP_STATE_STABLE
 };
@@ -129,9 +129,6 @@ static err_t update_arp_entry(struct netif *netif, struct ip_addr *ipaddr, struc
 
 
 /* Some checks, instead of etharp_init(): */
-#if ETHARP_STATE_EMPTY != 0
-#error ETHARP_STATE_EMPTY must be 0 to ensure correct initialization value!
-#endif
 #if (LWIP_ARP && (ARP_TABLE_SIZE > 0x7f))
   #error "If you want to use ARP, ARP_TABLE_SIZE must fit in an s8_t, so, you have to reduce it in your lwipopts.h"
 #endif
diff --git a/src/netif/ppp/magic.c b/src/netif/ppp/magic.c
index 3117b7da..d3922bb5 100644
--- a/src/netif/ppp/magic.c
+++ b/src/netif/ppp/magic.c
@@ -49,6 +49,10 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT
+
 #include "ppp.h"
 #include "randm.h"
 #include "magic.h"
@@ -74,3 +78,5 @@ u32_t magic()
 {
   return avRandom();
 }
+
+#endif /* PPP_SUPPORT */
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index e2d67cfc..9b45f543 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -83,6 +83,8 @@
 
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
 
+#include "lwip/ip.h" /* for ip_input() */
+
 #include "ppp.h"
 #include "pppdebug.h"