diff --git a/src/Filelists.mk b/src/Filelists.mk
index 18c224b1..7e295ffd 100644
--- a/src/Filelists.mk
+++ b/src/Filelists.mk
@@ -31,7 +31,7 @@
 
 # COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
 COREFILES=$(LWIPDIR)/core/def.c \
-        $(LWIPDIR)/core/dns.c \
+	$(LWIPDIR)/core/dns.c \
 	$(LWIPDIR)/core/inet_chksum.c \
 	$(LWIPDIR)/core/init.c \
 	$(LWIPDIR)/core/mem.c \
@@ -129,7 +129,10 @@ SNMPFILES=$(LWIPDIR)/apps/snmp/asn1_dec.c \
 # HTTPDFILES: HTTP server
 HTTPDFILES=$(LWIPDIR)/apps/httpd/fs.c \
 	$(LWIPDIR)/apps/httpd/httpd.c
-	
+
+# LWIPERFFILES: IPERF client
+LWIPERFFILES=$(LWIPDIR)/apps/lwiperf/lwiperf.c
+
 # SNTPFILES: SNTP client
 SNTPFILES=$(LWIPDIR)/apps/sntp/sntp.c
 
@@ -139,5 +142,6 @@ NETBIOSNSFILES=$(LWIPDIR)/apps/netbiosns/netbiosns.c
 # LWIPAPPFILES: All LWIP APPs
 LWIPAPPFILES=$(SNMPFILES) \
 	$(HTTPDFILES) \
+	$(LWIPERFFILES) \
 	$(SNTPFILES) \
 	$(NETBIOSNSFILES)
diff --git a/src/apps/lwiperf/lwiperf.c b/src/apps/lwiperf/lwiperf.c
index d1bdbfb3..f6ab39c7 100644
--- a/src/apps/lwiperf/lwiperf.c
+++ b/src/apps/lwiperf/lwiperf.c
@@ -85,14 +85,14 @@ typedef struct _lwiperf_settings {
 /** Basic connection handle */
 struct _lwiperf_state_base;
 typedef struct _lwiperf_state_base lwiperf_state_base_t;
-typedef struct _lwiperf_state_base {
+struct _lwiperf_state_base {
   /* 1=tcp, 0=udp */
   u8_t tcp;
   /* 1=server, 0=client */
   u8_t server;
   lwiperf_state_base_t* next;
   lwiperf_state_base_t* related_server_state;
-} lwiperf_state_base_t;
+};
 
 /** Connection handle for a TCP iperf session */
 typedef struct _lwiperf_state_tcp {