diff --git a/Makefile.in b/Makefile.in
index 1bf79869..70d30c32 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for libcoap
 #
-# Copyright (C) 2010--2014 Olaf Bergmann <bergmann@tzi.org>
+# Copyright (C) 2010--2015 Olaf Bergmann <bergmann@tzi.org>
 #
 # This file is part of the CoAP library libcoap. Please see
 # README for terms of use.
@@ -23,10 +23,10 @@ includerootdir = $(DESTDIR)$(prefix)/include
 librootdir = $(DESTDIR)$(prefix)/lib
 
 # files and flags
-SOURCES:= pdu.c net.c debug.c encode.c uri.c coap_list.c resource.c hashkey.c \
+SOURCES:= pdu.c net.c debug.c encode.c uri.c resource.c hashkey.c \
 	 str.c option.c async.c subscribe.c block.c mem.c coap_io.c
 OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
-HEADERS:=coap.h coap_config.h debug.h pdu.h net.h encode.h uri.h coap_list.h mem.h \
+HEADERS:=coap.h coap_config.h debug.h pdu.h net.h encode.h uri.h mem.h \
 	str.h option.h bits.h uthash.h utlist.h resource.h hashkey.h async.h \
 	subscribe.h block.h address.h prng.h coap_time.h t_list.h  coap_io.h
 CFLAGS:=-Wall -Wextra -std=c99 -pedantic @CFLAGS@
diff --git a/coap.h b/coap.h
index 0539bd9d..2a30db50 100644
--- a/coap.h
+++ b/coap.h
@@ -1,6 +1,6 @@
 /* coap.h -- main header file for CoAP stack
  *
- * Copyright (C) 2010--2012 Olaf Bergmann <bergmann@tzi.org>
+ * Copyright (C) 2010--2012,2015 Olaf Bergmann <bergmann@tzi.org>
  *
  * This file is part of the CoAP library libcoap. Please see
  * README for terms of use. 
@@ -16,7 +16,6 @@ extern "C" {
 #include "coap_config.h"
 #include "debug.h"
 #include "mem.h"
-#include "coap_list.h"
 #include "pdu.h"
 #include "option.h"
 #include "net.h"
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 9b2117dd..f343730d 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for libcoap
 #
-# Copyright (C) 2010,2011 Olaf Bergmann <bergmann@tzi.org>
+# Copyright (C) 2010,2011,2015 Olaf Bergmann <bergmann@tzi.org>
 #
 # This file is part of the CoAP library libcoap. Please see
 # README for terms of use. 
@@ -18,7 +18,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 # files and flags
 PROGRAMS:=coap-server coap-client rd #etsi_iot_01 tiny
-SOURCES:= tiny.c client.c server.c rd.c etsi_iot_01.c
+client_SOURCES:= client.o coap_list.o
+client_OBJECTS:= $(patsubst %.c, %.o, $(client_SOURCES))
+SOURCES:= tiny.c $(client_SOURCES) server.c rd.c etsi_iot_01.c
 OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
 #CFLAGS:=-g -Wall -ansi -pedantic -I..
 CFLAGS:=-g -Wall @CFLAGS@
@@ -43,8 +45,8 @@ check:
 tiny:	tiny.o $(libcoap)
 	$(CC) -o $@ $< $(LDFLAGS)
 
-coap-client: client.o $(libcoap)
-	$(CC) -o $@ $< $(LDFLAGS) $(LDLIBS)
+coap-client: $(CLIENT_OBJS) $(libcoap)
+	$(CC) -o $@ $(CLIENT_OBJS) $(LDFLAGS) $(LDLIBS)
 
 coap-server:	server.o $(libcoap)
 	$(CC) -o $@ $< $(LDFLAGS) $(LDLIBS)
diff --git a/coap_list.c b/examples/coap_list.c
similarity index 100%
rename from coap_list.c
rename to examples/coap_list.c
diff --git a/coap_list.h b/examples/coap_list.h
similarity index 100%
rename from coap_list.h
rename to examples/coap_list.h
diff --git a/pdu.h b/pdu.h
index eb7bc9fd..a13e0131 100644
--- a/pdu.h
+++ b/pdu.h
@@ -10,7 +10,6 @@
 #define _PDU_H_
 
 #include "coap_config.h"
-#include "coap_list.h"
 #include "uri.h"
 
 #ifdef WITH_LWIP