diff --git a/Makefile.in b/Makefile.in
index d1d8546..38cc665 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for tinydtls
 #
 #
-# Copyright (c) 2011, 2012, 2013, 2014, 2015 Olaf Bergmann (TZI) and others.
+# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Olaf Bergmann (TZI) and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # and Eclipse Distribution License v. 1.0 which accompanies this distribution.
@@ -34,10 +34,10 @@
 install := cp
 
 # files and flags
-SOURCES:= dtls.c crypto.c ccm.c hmac.c netq.c peer.c dtls_time.c session.c debug.c
+SOURCES:= dtls.c crypto.c ccm.c hmac.c netq.c peer.c dtls_time.c session.c dtls_debug.c
 SUB_OBJECTS:=aes/rijndael.o @OPT_OBJS@
 OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) $(SUB_OBJECTS)
-HEADERS:=dtls.h hmac.h debug.h dtls_config.h uthash.h numeric.h crypto.h global.h ccm.h \
+HEADERS:=dtls.h hmac.h dtls_debug.h dtls_config.h uthash.h numeric.h crypto.h global.h ccm.h \
  netq.h alert.h utlist.h prng.h peer.h state.h dtls_time.h session.h \
  tinydtls.h
 CFLAGS:=-Wall -pedantic -std=c99 @CFLAGS@
diff --git a/crypto.c b/crypto.c
index c2c3da5..3c4857a 100644
--- a/crypto.c
+++ b/crypto.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "global.h"
-#include "debug.h"
+#include "dtls_debug.h"
 #include "numeric.h"
 #include "dtls.h"
 #include "crypto.h"
diff --git a/dtls.c b/dtls.c
index 9a5d2dd..5dbf7fd 100644
--- a/dtls.c
+++ b/dtls.c
@@ -36,7 +36,7 @@
 #include "uthash.h"
 #endif /* DTLS_PEERS_NOHASH */
 
-#include "debug.h"
+#include "dtls_debug.h"
 #include "numeric.h"
 #include "netq.h"
 #include "dtls.h"
diff --git a/debug.c b/dtls_debug.c
similarity index 99%
rename from debug.c
rename to dtls_debug.c
index 6fd820d..8f41e36 100644
--- a/debug.c
+++ b/dtls_debug.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "global.h"
-#include "debug.h"
+#include "dtls_debug.h"
 
 #ifndef min
 #define min(a,b) ((a) < (b) ? (a) : (b))
diff --git a/debug.h b/dtls_debug.h
similarity index 100%
rename from debug.h
rename to dtls_debug.h
diff --git a/hmac.c b/hmac.c
index ef385a7..1cc2d71 100644
--- a/hmac.c
+++ b/hmac.c
@@ -27,7 +27,7 @@
 #define assert(x)
 #endif
 
-#include "debug.h"
+#include "dtls_debug.h"
 #include "hmac.h"
 
 /* use malloc()/free() on platforms other than Contiki */
diff --git a/netq.c b/netq.c
index d223c14..a472b07 100644
--- a/netq.c
+++ b/netq.c
@@ -16,7 +16,7 @@
  *******************************************************************************/
 
 #include "dtls_config.h"
-#include "debug.h"
+#include "dtls_debug.h"
 #include "netq.h"
 #include "utlist.h"
 
diff --git a/peer.c b/peer.c
index 08d4277..40ff605 100644
--- a/peer.c
+++ b/peer.c
@@ -17,7 +17,7 @@
 
 #include "global.h"
 #include "peer.h"
-#include "debug.h"
+#include "dtls_debug.h"
 
 #ifndef WITH_CONTIKI
 void peer_init()
diff --git a/tests/cbc_aes128-test.c b/tests/cbc_aes128-test.c
index 1f91920..7065f95 100644
--- a/tests/cbc_aes128-test.c
+++ b/tests/cbc_aes128-test.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "debug.h"
+#include "dtls_debug.h"
 #include "numeric.h"
 #include "crypto.h"
 
diff --git a/tests/ccm-test.c b/tests/ccm-test.c
index e26f43b..0e2062e 100644
--- a/tests/ccm-test.c
+++ b/tests/ccm-test.c
@@ -11,7 +11,7 @@
 #include "contiki-net.h"
 #endif /* WITH_CONTIKI */
 
-//#include "debug.h"
+//#include "dtls_debug.h"
 #include "dtls_config.h"
 #include "numeric.h"
 #include "ccm.h"
diff --git a/tests/dtls-client.c b/tests/dtls-client.c
index 9bee934..ab678d3 100644
--- a/tests/dtls-client.c
+++ b/tests/dtls-client.c
@@ -17,7 +17,7 @@
 #include <signal.h>
 
 #include "global.h" 
-#include "debug.h" 
+#include "dtls_debug.h"
 #include "dtls.h" 
 
 #define DEFAULT_PORT 20220
diff --git a/tests/dtls-server.c b/tests/dtls-server.c
index 3f030b1..1596e18 100644
--- a/tests/dtls-server.c
+++ b/tests/dtls-server.c
@@ -16,7 +16,7 @@
 
 #include "tinydtls.h" 
 #include "dtls.h" 
-#include "debug.h" 
+#include "dtls_debug.h"
 
 #define DEFAULT_PORT 20220
 
diff --git a/tests/pcap.c b/tests/pcap.c
index 7534c5f..c49197c 100644
--- a/tests/pcap.c
+++ b/tests/pcap.c
@@ -4,7 +4,7 @@
 #include <pcap/pcap.h>
 
 #include "tinydtls.h"
-#include "debug.h"
+#include "dtls_debug.h"
 #include "dtls.h"
 
 #define TRANSPORT_HEADER_SIZE (14+20+8) /* Ethernet + IP + UDP */
diff --git a/tests/prf-test.c b/tests/prf-test.c
index d8d83d9..764fdec 100644
--- a/tests/prf-test.c
+++ b/tests/prf-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include "tinydtls.h"
-#include "debug.h"
+#include "dtls_debug.h"
 #include "global.h"
 #include "crypto.h"