diff --git a/clients/net-snk/app/Makefile b/clients/net-snk/app/Makefile
index 8b0c08f..6faed63 100644
--- a/clients/net-snk/app/Makefile
+++ b/clients/net-snk/app/Makefile
@@ -16,7 +16,7 @@ export TOP
 endif
 include $(TOP)/make.rules
 
-CFLAGS +=$(ADDCFLAGS)
+CFLAGS +=$(ADDCFLAGS) -Inetlib
 
 OBJS = main.o
 OBJDIRS = netlib/netlib.o netapps/netboot.o 
diff --git a/clients/net-snk/app/netapps/Makefile b/clients/net-snk/app/netapps/Makefile
index 70b990a..1e50226 100644
--- a/clients/net-snk/app/netapps/Makefile
+++ b/clients/net-snk/app/netapps/Makefile
@@ -16,7 +16,7 @@ ifndef TOP
 endif
 include $(TOP)/make.rules
 
-CFLAGS += -I../ -I../../../../lib/ -Wall -W
+CFLAGS += -I.. -I../netlib -I../../../../lib/ -Wall -W
 
 OBJS    = netboot.o ping.o args.o
 
diff --git a/clients/net-snk/app/netapps/netapps.h b/clients/net-snk/app/netapps/netapps.h
index 20879c5..d3f7eb2 100644
--- a/clients/net-snk/app/netapps/netapps.h
+++ b/clients/net-snk/app/netapps/netapps.h
@@ -13,7 +13,7 @@
 #ifndef _NETAPPS_H_
 #define _NETAPPS_H_
 
-#include <netlib/tftp.h>
+#include <tftp.h>
 
 #define F_IPV4	4
 #define F_IPV6	6
diff --git a/clients/net-snk/app/netapps/netboot.c b/clients/net-snk/app/netapps/netboot.c
index bb1db03..d99aa29 100644
--- a/clients/net-snk/app/netapps/netboot.c
+++ b/clients/net-snk/app/netapps/netboot.c
@@ -10,21 +10,21 @@
  *     IBM Corporation - initial implementation
  *****************************************************************************/
 
-#include <netlib/tftp.h>
-#include <netlib/ethernet.h>
-#include <netlib/dhcp.h>
-#include <netlib/dhcpv6.h>
-#include <netlib/ipv4.h>
-#include <netlib/ipv6.h>
-#include <netlib/dns.h>
+#include <tftp.h>
+#include <ethernet.h>
+#include <dhcp.h>
+#include <dhcpv6.h>
+#include <ipv4.h>
+#include <ipv6.h>
+#include <dns.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <netapps/args.h>
 #include <libbootmsg/libbootmsg.h>
 #include <of.h>
+#include "args.h"
 #include "netapps.h"
 
 #define IP_INIT_DEFAULT 5
diff --git a/clients/net-snk/app/netapps/ping.c b/clients/net-snk/app/netapps/ping.c
index f55e0db..def3179 100644
--- a/clients/net-snk/app/netapps/ping.c
+++ b/clients/net-snk/app/netapps/ping.c
@@ -10,15 +10,15 @@
  *     IBM Corporation - initial implementation
  *****************************************************************************/
 
-#include <netlib/ipv4.h>
-#include <netlib/dhcp.h>
-#include <netlib/ethernet.h>
+#include <ipv4.h>
+#include <dhcp.h>
+#include <ethernet.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <netapps/args.h>
+#include "args.h"
 #include "netapps.h"
 
 struct ping_args {
diff --git a/clients/net-snk/app/netlib/Makefile b/clients/net-snk/app/netlib/Makefile
index df09bf8..610e189 100644
--- a/clients/net-snk/app/netlib/Makefile
+++ b/clients/net-snk/app/netlib/Makefile
@@ -16,7 +16,7 @@ ifndef TOP
 endif
 include $(TOP)/make.rules
 
-CFLAGS += -I../
+CFLAGS += -I../netapps
 
 ifeq ($(SNK_USE_MTFTP), 1)
 CFLAGS += -DUSE_MTFTP
diff --git a/clients/net-snk/app/netlib/dhcp.c b/clients/net-snk/app/netlib/dhcp.c
index 7e2e88c..0cb4fa4 100644
--- a/clients/net-snk/app/netlib/dhcp.c
+++ b/clients/net-snk/app/netlib/dhcp.c
@@ -48,7 +48,7 @@
 #include <ipv4.h>
 #include <udp.h>
 #include <dns.h>
-#include <netapps/args.h>
+#include <args.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/clients/net-snk/app/netlib/dhcp.h b/clients/net-snk/app/netlib/dhcp.h
index 54fb1ee..645fdd1 100644
--- a/clients/net-snk/app/netlib/dhcp.h
+++ b/clients/net-snk/app/netlib/dhcp.h
@@ -16,9 +16,9 @@
 #include <stdint.h>
 
 #ifdef USE_MTFTP
-#include <netlib/mtftp.h>
+#include <mtftp.h>
 #else
-#include <netlib/tftp.h>
+#include <tftp.h>
 #endif
 
 /** \struct btphdr
diff --git a/clients/net-snk/app/netlib/dhcpv6.c b/clients/net-snk/app/netlib/dhcpv6.c
index d0a22d5..491d540 100644
--- a/clients/net-snk/app/netlib/dhcpv6.c
+++ b/clients/net-snk/app/netlib/dhcpv6.c
@@ -16,12 +16,12 @@
 #include <stdint.h>
 #include <sys/socket.h>
 #include <time.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
-#include <netlib/udp.h>
-#include <netlib/dhcpv6.h>
-#include <netlib/tftp.h>
-#include <netlib/dns.h>
+#include "ethernet.h"
+#include "ipv6.h"
+#include "udp.h"
+#include "dhcpv6.h"
+#include "tftp.h"
+#include "dns.h"
 
 static uint8_t tid[3];
 static uint32_t dhcpv6_state = -1;
diff --git a/clients/net-snk/app/netlib/dhcpv6.h b/clients/net-snk/app/netlib/dhcpv6.h
index fb77da6..02747a0 100644
--- a/clients/net-snk/app/netlib/dhcpv6.h
+++ b/clients/net-snk/app/netlib/dhcpv6.h
@@ -14,7 +14,7 @@
 #define _DHCPV6_H_
 
 #include <stdint.h>
-#include <netlib/ethernet.h>
+#include "ethernet.h"
 
 #define DHCPV6_STATELESS 0
 #define DHCPV6_STATEFUL  1
diff --git a/clients/net-snk/app/netlib/icmpv6.c b/clients/net-snk/app/netlib/icmpv6.c
index 51e4a5f..e897588 100644
--- a/clients/net-snk/app/netlib/icmpv6.c
+++ b/clients/net-snk/app/netlib/icmpv6.c
@@ -15,11 +15,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
-#include <netlib/icmpv6.h>
-#include <netlib/ndp.h>
-#include <netlib/dhcpv6.h>
+#include "ethernet.h"
+#include "ipv6.h"
+#include "icmpv6.h"
+#include "ndp.h"
+#include "dhcpv6.h"
 
 static int ra_received = 0;
 
diff --git a/clients/net-snk/app/netlib/icmpv6.h b/clients/net-snk/app/netlib/icmpv6.h
index 3279797..41b0c70 100644
--- a/clients/net-snk/app/netlib/icmpv6.h
+++ b/clients/net-snk/app/netlib/icmpv6.h
@@ -14,8 +14,8 @@
 #define _ICMPV6_H_
 
 #include <stdint.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
+#include "ethernet.h"
+#include "ipv6.h"
 
 #define __ICMPV6_DEBUG__
 
diff --git a/clients/net-snk/app/netlib/ipv6.c b/clients/net-snk/app/netlib/ipv6.c
index 300c913..49de5c7 100644
--- a/clients/net-snk/app/netlib/ipv6.c
+++ b/clients/net-snk/app/netlib/ipv6.c
@@ -17,11 +17,11 @@
 #include <time.h>
 #include <ctype.h>
 #include <sys/socket.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
-#include <netlib/icmpv6.h>
-#include <netlib/ndp.h>
-#include <netlib/udp.h>
+#include "ethernet.h"
+#include "ipv6.h"
+#include "icmpv6.h"
+#include "ndp.h"
+#include "udp.h"
 
 #undef IPV6_DEBUG
 //#define IPV6_DEBUG
diff --git a/clients/net-snk/app/netlib/ipv6.h b/clients/net-snk/app/netlib/ipv6.h
index 6565a88..6f783b3 100644
--- a/clients/net-snk/app/netlib/ipv6.h
+++ b/clients/net-snk/app/netlib/ipv6.h
@@ -14,7 +14,7 @@
 #define _IPV6_H_
 
 #include <stdint.h>
-#include <netlib/ethernet.h>
+#include "ethernet.h"
 
 #define __IPV6_DEBUG__
 
diff --git a/clients/net-snk/app/netlib/ndp.c b/clients/net-snk/app/netlib/ndp.c
index 263bee2..f1f51c7 100644
--- a/clients/net-snk/app/netlib/ndp.c
+++ b/clients/net-snk/app/netlib/ndp.c
@@ -13,9 +13,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <netlib/ipv6.h>
-#include <netlib/icmpv6.h>
-#include <netlib/ndp.h>
+#include "ipv6.h"
+#include "icmpv6.h"
+#include "ndp.h"
 
 /* Neighbor cache */
 static struct neighbor *first_neighbor;
diff --git a/clients/net-snk/app/netlib/ndp.h b/clients/net-snk/app/netlib/ndp.h
index 7274f10..cd18158 100644
--- a/clients/net-snk/app/netlib/ndp.h
+++ b/clients/net-snk/app/netlib/ndp.h
@@ -13,7 +13,7 @@
 #ifndef _NDP_H_
 #define _NDP_H_
 
-#include <netlib/ipv6.h>
+#include "ipv6.h"
 
 #define __NDP_DEBUG__
 
diff --git a/clients/net-snk/app/netlib/tftp.h b/clients/net-snk/app/netlib/tftp.h
index 1cf1266..6b5996c 100644
--- a/clients/net-snk/app/netlib/tftp.h
+++ b/clients/net-snk/app/netlib/tftp.h
@@ -15,7 +15,7 @@
 #define _TFTP_H_
 
 #include <stdint.h>
-#include <netlib/ipv6.h>
+#include "ipv6.h"
 
 struct tftphdr {
 	int16_t th_opcode;