diff --git a/libeplayer3/container/container_ffmpeg.cpp b/libeplayer3/container/container_ffmpeg.cpp
index 2402cd6..7ba8d8a 100644
--- a/libeplayer3/container/container_ffmpeg.cpp
+++ b/libeplayer3/container/container_ffmpeg.cpp
@@ -43,7 +43,6 @@
 
 #include "player.h"
 #include "misc.h"
-#include "debug.h"
 
 Input::Input()
 {
diff --git a/libeplayer3/include/debug.h b/libeplayer3/include/debug.h
deleted file mode 100644
index 3951ca0..0000000
--- a/libeplayer3/include/debug.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef debug_123
-#define debug_123
-
-#include <stdio.h>
-#include <errno.h>
-
-static inline void Hexdump(unsigned char *Data, int length)
-{
-
-    int k;
-    for (k = 0; k < length; k++) {
-	printf("%02x ", Data[k]);
-	if (((k + 1) & 31) == 0)
-	    printf("\n");
-    }
-    printf("\n");
-
-}
-
-#endif
diff --git a/libeplayer3/output/writer/misc.cpp b/libeplayer3/output/writer/misc.cpp
index 7eb7f6f..e90b4aa 100644
--- a/libeplayer3/output/writer/misc.cpp
+++ b/libeplayer3/output/writer/misc.cpp
@@ -17,51 +17,18 @@
  *
  */
 
-/* ***************************** */
-/* Includes                      */
-/* ***************************** */
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <linux/dvb/video.h>
-#include <linux/dvb/audio.h>
-#include <linux/dvb/stm_ioctls.h>
 #include <memory.h>
 #include <asm/types.h>
 #include <pthread.h>
 #include <errno.h>
 
-#include "player.h"
-#include "output.h"
-#include "debug.h"
 #include "misc.h"
 
-/* ***************************** */
-/* Makros/Constants              */
-/* ***************************** */
-
-/* ***************************** */
-/* Types                         */
-/* ***************************** */
-
-/* ***************************** */
-/* Varaibles                     */
-/* ***************************** */
-
-/* ***************************** */
-/* Prototypes                    */
-/* ***************************** */
-
-/* ***************************** */
-/* MISC Functions                */
-/* ***************************** */
-
 void PutBits(BitPacker_t * ld, unsigned int code, unsigned int length)
 {
     unsigned int bit_buf;
diff --git a/libeplayer3/output/writer/mpeg2.cpp b/libeplayer3/output/writer/mpeg2.cpp
index 8630b54..46c98a9 100644
--- a/libeplayer3/output/writer/mpeg2.cpp
+++ b/libeplayer3/output/writer/mpeg2.cpp
@@ -28,7 +28,6 @@
 
 #include <algorithm>
 
-#include "debug.h"
 #include "misc.h"
 #include "pes.h"
 #include "writer.h"
diff --git a/libeplayer3/output/writer/pes.cpp b/libeplayer3/output/writer/pes.cpp
index c5809c4..f496fef 100644
--- a/libeplayer3/output/writer/pes.cpp
+++ b/libeplayer3/output/writer/pes.cpp
@@ -41,7 +41,6 @@
 
 #include "player.h"
 #include "output.h"
-#include "debug.h"
 #include "misc.h"
 #include "pes.h"
 #include "writer.h"