diff --git a/src/core/ipv4/ip4_napt.c b/src/core/ipv4/ip4_napt.c
index 28d844fda..00c5da1e0 100644
--- a/src/core/ipv4/ip4_napt.c
+++ b/src/core/ipv4/ip4_napt.c
@@ -795,7 +795,7 @@ ip_napt_forward(struct pbuf *p, struct ip_hdr *iphdr, struct netif *inp, struct
       if (m->mport != udphdr->src)
         ip_napt_modify_port_udp(udphdr, 0, m->mport);
       ip_napt_modify_addr_udp(udphdr, &iphdr->src, m->maddr);
-      LWIP_DEBUGF(NAPT_DEBUG, ("Modify UDP addr %x %x", iphdr->src.addr, m->maddr));
+      LWIP_DEBUGF(NAPT_DEBUG, ("Modify UDP addr %" X32_F " %" X32_F, iphdr->src.addr, m->maddr));
       ip_napt_modify_addr(iphdr, &iphdr->src, m->maddr);
       return ERR_OK;
     }
diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c
index 38cbc723c..3b36b5608 100644
--- a/src/core/tcp_in.c
+++ b/src/core/tcp_in.c
@@ -1598,7 +1598,7 @@ tcp_receive(struct tcp_pcb *pcb)
           if (pcb->rcv_wnd < TCP_TCPLEN(cseg)) {
             LWIP_DEBUGF(TCP_INPUT_DEBUG,
                       ("tcp_receive: OOSEQ packet out of wnd "
-                       "seqno=%"U32_F" wnd =%"U32_F" len=%"U16_F
+                       "seqno=%"U32_F" wnd =%"TCPWNDSIZE_F" len=%"U16_F
                        "snd_wl1=%"U32_F" snd_wl2 =%"U32_F" f = %"X16_F" tf=%"U16_F"\n",
                        seqno,pcb->rcv_wnd,cseg->len,pcb->snd_wl1,pcb->snd_wl1,
                        TCPH_FLAGS((cseg)->tcphdr),pcb->flags));
@@ -1819,7 +1819,7 @@ tcp_receive(struct tcp_pcb *pcb)
                     if (TCPH_FLAGS(next->next->tcphdr) & TCP_SYN) {
                       LWIP_DEBUGF(TCP_INPUT_DEBUG,
                                   ("tcp_receive: ooseq not trimmed correctly to rcv_wnd "
-                                  "seqno=%"U32_F" wnd =%"U32_F" len=%"U16_F
+                                  "seqno=%"U32_F" wnd =%"TCPWNDSIZE_F" len=%"U16_F
                                   "snd_wl1=%"U32_F" snd_wl2 =%"U32_F" f = %"X16_F" tf=%"U16_F"\n",
                                    seqno,pcb->rcv_wnd,next->next->len,pcb->snd_wl1,pcb->snd_wl1,
                                    TCPH_FLAGS(next->next->tcphdr),pcb->flags));
diff --git a/src/netif/ppp/vj.c b/src/netif/ppp/vj.c
index 3fecba699..6bc96a1a0 100644
--- a/src/netif/ppp/vj.c
+++ b/src/netif/ppp/vj.c
@@ -469,7 +469,7 @@ vj_uncompress_uncomp(struct pbuf *nb, struct vjcompress *comp)
       || (hlen += TCPH_HDRLEN_BYTES((struct tcp_hdr *)&((char *)ip)[hlen]))
           > nb->len
       || hlen > MAX_HDR) {
-    PPPDEBUG(LOG_INFO, ("vj_uncompress_uncomp: bad cid=%d, hlen=%d buflen=%d\n",
+    PPPDEBUG(LOG_INFO, ("vj_uncompress_uncomp: bad cid=%d, hlen=%" U32_F " buflen=%d\n",
       IPH_PROTO(ip), hlen, nb->len));
     vj_uncompress_err(comp);
     return -1;
@@ -596,7 +596,7 @@ vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp)
      * We must have dropped some characters (crc should detect
      * this but the old slip framing won't)
      */
-    PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: head buffer %d too short %d\n",
+    PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: head buffer %d too short %" U32_F "\n",
           n0->len, vjlen));
     goto bad;
   }