18 files changed, 4 insertions, 46 deletions

diff --git a/dxr3.c b/dxr3.c
index 945ad6d..6508349 100644
--- a/dxr3.c
+++ b/dxr3.c
@@ -9,9 +9,6 @@
 
 #include <vdr/plugin.h>
 #include "dxr3device.h"
-#include "dxr3syncbuffer.h"
-#include "dxr3configdata.h"
-#include "dxr3interface.h"
 #include "dxr3.h"
 
 static const char VERSION[]       = "0.2.9+git";
diff --git a/dxr3audiodecoder.c b/dxr3audiodecoder.c
index 6066711..d670d19 100644
--- a/dxr3audiodecoder.c
+++ b/dxr3audiodecoder.c
@@ -26,7 +26,6 @@
   - cDxr3AudioDecoder::Init: Why are we always reinit the codec?
 */
 
-#include <stdio.h>
 #include <algorithm>
 #include "dxr3audiodecoder.h"
 #include "dxr3pesframe.h"
diff --git a/dxr3audiodecoder.h b/dxr3audiodecoder.h
index d81b66a..4ef0706 100644
--- a/dxr3audiodecoder.h
+++ b/dxr3audiodecoder.h
@@ -23,9 +23,6 @@
 #ifndef _DXR3_AUDIODECODER_H_
 #define _DXR3_AUDIODECODER_H_
 
-#include <stdlib.h>
-#include <stdint.h>
-
 extern "C" {
 #    include <libavcodec/avcodec.h>
 }
diff --git a/dxr3colormanager.c b/dxr3colormanager.c
index 044d254..d53170a 100644
--- a/dxr3colormanager.c
+++ b/dxr3colormanager.c
@@ -47,13 +47,8 @@
 	til the end of the line.
 **/
 
-
-#include <assert.h>
-
 #include "dxr3colormanager.h"
 #include <vdr/tools.h>
-#include <stdio.h>
-#include <string.h>
 
 // ==================================
 //! constructor
diff --git a/dxr3colormanager.h b/dxr3colormanager.h
index 2a2553c..65a62ac 100644
--- a/dxr3colormanager.h
+++ b/dxr3colormanager.h
@@ -39,8 +39,6 @@ private:
  *@author Stefan Schluenss
  */
 
-#include <stdio.h>
-
 #define OSD_SPU_CM_DUMP 0
 
 #define MAX_NO_OF_SECTIONS 15
diff --git a/dxr3demuxdevice.c b/dxr3demuxdevice.c
index f74504c..0b08e82 100644
--- a/dxr3demuxdevice.c
+++ b/dxr3demuxdevice.c
@@ -19,13 +19,8 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <linux/em8300.h>
 #include "dxr3demuxdevice.h"
 #include "dxr3pesframe.h"
-#include "dxr3configdata.h"
 
 // ==================================
 //! constructor
diff --git a/dxr3demuxdevice.h b/dxr3demuxdevice.h
index c3bc83b..0da7dd8 100644
--- a/dxr3demuxdevice.h
+++ b/dxr3demuxdevice.h
@@ -24,7 +24,6 @@
 
 #include "dxr3generaldefines.h"
 #include "dxr3syncbuffer.h"
-#include "dxr3audiodecoder.h"
 #include "dxr3output.h"
 
 const int AUDIO_MAX_BUFFER_SIZE = 200;
diff --git a/dxr3device.h b/dxr3device.h
index 0c018ef..2ed4856 100644
--- a/dxr3device.h
+++ b/dxr3device.h
@@ -23,7 +23,7 @@
 #ifndef _DXR3_DEVICE_H_
 #define _DXR3_DEVICE_H_
 
-#include <string>
+//#include <string>
 #include <vdr/device.h>
 
 #include "dxr3interface.h"
diff --git a/dxr3dolbydigital.c b/dxr3dolbydigital.c
index ae9bce9..013742f 100644
--- a/dxr3dolbydigital.c
+++ b/dxr3dolbydigital.c
@@ -35,19 +35,19 @@ void cDxr3DolbyDigital::Play(const uchar *Data, int Length)
 }
 
 // ==================================
-// 
+//
 void cDxr3DolbyDigital::Mute(bool On)
 {
 }
 
 // ==================================
-// 
+//
 void cDxr3DolbyDigital::Clear()
 {
 }
 
 // ==================================
-// 
+//
 void cDxr3DolbyDigital::Action()
 {
 }
diff --git a/dxr3interface.c b/dxr3interface.c
index 6fc538f..d4b16c7 100644
--- a/dxr3interface.c
+++ b/dxr3interface.c
@@ -21,11 +21,6 @@
  *
  */
 
-#include <assert.h>
-#include <math.h>
-#include <sys/soundcard.h>
-#include <linux/dvb/audio.h>
-
 #include "dxr3interface.h"
 #include "dxr3syncbuffer.h"
 #include "dxr3osd.h"
diff --git a/dxr3interface.h b/dxr3interface.h
index 6428ae1..c08ef0c 100644
--- a/dxr3interface.h
+++ b/dxr3interface.h
@@ -23,8 +23,6 @@
 #ifndef _DXR3_INTERFACE_H_
 #define _DXR3_INTERFACE_H_
 
-#include <stdlib.h>
-#include <stdint.h>
 #include <linux/em8300.h>
 #include <sys/ioctl.h>
 #include <linux/limits.h>
@@ -32,7 +30,6 @@
 #include <vdr/tools.h>
 #include "dxr3configdata.h"
 #include "dxr3sysclock.h"
-#include "dxr3configdata.h"
 
 // ==================================
 class cFixedLengthFrame;
diff --git a/dxr3interface_spu_encoder.h b/dxr3interface_spu_encoder.h
index c3c8420..d1d1b57 100644
--- a/dxr3interface_spu_encoder.h
+++ b/dxr3interface_spu_encoder.h
@@ -30,12 +30,9 @@
 #ifndef _DXR3_INTERFACE_SPU_ENCODER_
 #define _DXR3_INTERFACE_SPU_ENCODER_
 
-#include <stdlib.h>
-#include <linux/dvb/osd.h>
 #include <vdr/osd.h>
 #include "dxr3colormanager.h"
 #include "dxr3interface.h"
-#include "dxr3singleton.h"
 
 // ==================================
 #define MAXWINDOWS	8
diff --git a/dxr3osd.c b/dxr3osd.c
index a335da9..765aa67 100644
--- a/dxr3osd.c
+++ b/dxr3osd.c
@@ -20,11 +20,6 @@
  *
  */
 
-#include <linux/em8300.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/unistd.h>
-
 #include "dxr3interface.h"
 
 #include "dxr3osd.h"
diff --git a/dxr3output.c b/dxr3output.c
index 76c256d..d8d3c8a 100644
--- a/dxr3output.c
+++ b/dxr3output.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <stdio.h>
 #include <time.h>
 #include "dxr3output.h"
 
diff --git a/dxr3pesframe.h b/dxr3pesframe.h
index 8bc4882..5c174b5 100644
--- a/dxr3pesframe.h
+++ b/dxr3pesframe.h
@@ -23,7 +23,6 @@
 #define _DXR3PESFRAME_H_
 
 #include <assert.h>
-#include <stdint.h>
 #include "dxr3audio.h"
 #include "Uncopyable.h"
 
diff --git a/dxr3spudecoder.c b/dxr3spudecoder.c
index 9fbd4e6..a197800 100644
--- a/dxr3spudecoder.c
+++ b/dxr3spudecoder.c
@@ -23,8 +23,6 @@
  */
 
 #include <assert.h>
-#include <string.h>
-#include <inttypes.h>
 #include <math.h>
 
 #include "dxr3spudecoder.h"
diff --git a/dxr3spudecoder.h b/dxr3spudecoder.h
index e0e5795..70adf57 100644
--- a/dxr3spudecoder.h
+++ b/dxr3spudecoder.h
@@ -24,7 +24,6 @@
 
 #include <vdr/osd.h>
 #include <vdr/spu.h>
-#include <inttypes.h>
 
 // ==================================
 typedef struct sDxr3SpuPalDescr
diff --git a/dxr3syncbuffer.h b/dxr3syncbuffer.h
index 8220e63..358368f 100644
--- a/dxr3syncbuffer.h
+++ b/dxr3syncbuffer.h
@@ -22,7 +22,6 @@
 #ifndef _DXR3SYNCBUFFER_H_
 #define _DXR3SYNCBUFFER_H_
 
-#include <stdint.h>
 
 #include <vdr/ringbuffer.h>
 #include "dxr3interface.h"