Fix header includes.

17 files changed, 38 insertions, 16 deletions

diff --git a/HISTORY b/HISTORY
index 052f3bf..f8e8a24 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,6 +3,7 @@ VDR Plugin 'epgfixer' Revision History
 
 2013-xx-xx: Version x.x.x
 
+- Fix header includes.
 - Makefile fixes. Install example config files automatically.
 - Fix crash in config editing menus if using color buttons when config is empty.
 - Fix SVDRP command REL (thanks to Ville Skyttä).
diff --git a/blacklist.h b/blacklist.h
index 1d60185..da82219 100644
--- a/blacklist.h
+++ b/blacklist.h
@@ -8,8 +8,10 @@
 #ifndef __EPGFIXER_BLACKLIST_H_
 #define __EPGFIXER_BLACKLIST_H_
 
+#include <vdr/channels.h>
+#include <vdr/tools.h>
+
 #include "tools.h"
-#include <vdr/epg.h>
 
 class cBlacklist : public cListItem
 {
diff --git a/charset.c b/charset.c
index 90c4a04..fec5864 100644
--- a/charset.c
+++ b/charset.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <string.h>
 #include "charset.h"
 
 /* Global instance */
diff --git a/charset.h b/charset.h
index 2207250..395c838 100644
--- a/charset.h
+++ b/charset.h
@@ -8,8 +8,9 @@
 #ifndef __EPGFIXER_CHARSET_H_
 #define __EPGFIXER_CHARSET_H_
 
-#include "tools.h"
 #include <vdr/epg.h>
+#include <vdr/tools.h>
+#include "tools.h"
 
 class cCharSet : public cListItem
 {
diff --git a/config.c b/config.c
index aa40420..9fab87b 100644
--- a/config.c
+++ b/config.c
@@ -5,8 +5,9 @@
  *
  */
 
-#include "config.h"
+#include <stdlib.h>
 #include <string.h>
+#include "config.h"
 
 /* Global instance */
 cEpgfixerSetup EpgfixerSetup;
diff --git a/config.h b/config.h
index ad0a778..3650d72 100644
--- a/config.h
+++ b/config.h
@@ -8,7 +8,7 @@
 #ifndef __EPGFIXER_CONFIG_H_
 #define __EPGFIXER_CONFIG_H_
 
-#include "regexp.h"
+#include <vdr/tools.h>
 
 class cEpgfixerSetup
 {
diff --git a/epgclone.c b/epgclone.c
index 427665a..9a092fa 100644
--- a/epgclone.c
+++ b/epgclone.c
@@ -5,6 +5,8 @@
  *
  */
 
+#include <stdlib.h>
+#include <string.h>
 #include "epgclone.h"
 
 /* Global instance */
diff --git a/epgclone.h b/epgclone.h
index 894547c..13e97cd 100644
--- a/epgclone.h
+++ b/epgclone.h
@@ -8,8 +8,9 @@
 #ifndef __EPGFIXER_EPGCLONE_H_
 #define __EPGFIXER_EPGCLONE_H_
 
-#include "tools.h"
 #include <vdr/epg.h>
+#include <vdr/tools.h>
+#include "tools.h"
 
 class cEpgClone : public cListItem
 {
diff --git a/epgfixer.c b/epgfixer.c
index bf15116..653179f 100644
--- a/epgfixer.c
+++ b/epgfixer.c
@@ -5,14 +5,16 @@
  *
  */
 
+#include <getopt.h>
+#include <stdlib.h>
 #include <vdr/plugin.h>
 #include <vdr/i18n.h>
 #include "blacklist.h"
 #include "charset.h"
 #include "epgclone.h"
+#include "epghandler.h"
 #include "regexp.h"
 #include "setup_menu.h"
-#include "epghandler.h"
 
 #if defined(APIVERSNUM) && APIVERSNUM < 10726
 #error "VDR-1.7.26 API version or greater is required!"
diff --git a/epghandler.c b/epghandler.c
index da62dd5..b30ee1a 100644
--- a/epghandler.c
+++ b/epghandler.c
@@ -5,14 +5,14 @@
  *
  */
 
+#include <string.h>
+#include <vdr/tools.h>
 #include "epghandler.h"
 #include "blacklist.h"
 #include "charset.h"
 #include "config.h"
 #include "epgclone.h"
 #include "regexp.h"
-#include <vdr/tools.h>
-#include <string.h>
 
 //
 // Original VDR bug fixes adapted from epg.c of VDR
diff --git a/epghandler.h b/epghandler.h
index 2e03d25..cd5d51e 100644
--- a/epghandler.h
+++ b/epghandler.h
@@ -8,6 +8,7 @@
 #ifndef __EPGFIXER_EPGHANDLER_H
 #define __EPGFIXER_EPGHANDLER_H
 
+#include <vdr/channels.h>
 #include <vdr/epg.h>
 
 class cEpgfixerEpgHandler : public cEpgHandler
diff --git a/regexp.c b/regexp.c
index 8392586..9067911 100644
--- a/regexp.c
+++ b/regexp.c
@@ -5,6 +5,8 @@
  *
  */
 
+#include <stdlib.h>
+#include <string.h>
 #include "regexp.h"
 
 // for PCRE without JIT support
diff --git a/regexp.h b/regexp.h
index 7077a00..c1565e2 100644
--- a/regexp.h
+++ b/regexp.h
@@ -8,13 +8,14 @@
 #ifndef __EPGFIXER_REGEXP_H_
 #define __EPGFIXER_REGEXP_H_
 
-#include "tools.h"
-#include <vdr/epg.h>
-
 #ifdef HAVE_PCREPOSIX
 #include <pcre.h>
 #endif
 
+#include <vdr/epg.h>
+#include <vdr/tools.h>
+#include "tools.h"
+
 typedef enum { REGEXP_TITLE, REGEXP_SHORTTEXT, REGEXP_DESCRIPTION, REGEXP_UNDEFINED } sources;
 
 class cRegexp : public cListItem
diff --git a/setup_menu.c b/setup_menu.c
index 59846d2..19f84a2 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -5,14 +5,18 @@
  *
  */
 
-#include "setup_menu.h"
+#include <stdio.h>
 #include <vdr/config.h>
+#include <vdr/eit.h>
 #include <vdr/i18n.h>
+#include <vdr/menu.h>
+#include <vdr/skins.h>
 #include "blacklist.h"
 #include "charset.h"
 #include "epgclone.h"
 #include "regexp.h"
 #include "tools.h"
+#include "setup_menu.h"
 
 //--- cMenuSetupConfigEditor ------------------------------------------------------
 
diff --git a/setup_menu.h b/setup_menu.h
index 6eef26f..c9f7332 100644
--- a/setup_menu.h
+++ b/setup_menu.h
@@ -8,8 +8,8 @@
 #ifndef __EPGFIXER_SETUP_MENU_H
 #define __EPGFIXER_SETUP_MENU_H
 
-#include <vdr/menu.h>
 #include <vdr/menuitems.h>
+#include <vdr/tools.h>
 #include "config.h"
 
 class cMenuSetupEpgfixer : public cMenuSetupPage
diff --git a/tools.c b/tools.c
index 4080c03..8f86ed0 100644
--- a/tools.c
+++ b/tools.c
@@ -5,9 +5,12 @@
  *
  */
 
-#include "tools.h"
+#include <stdlib.h>
+#include <string.h>
 #include <vdr/thread.h>
 
+#include "tools.h"
+
 //
 // HTML conversion code taken from RSS Reader plugin for VDR
 // http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/
diff --git a/tools.h b/tools.h
index 9dda805..d77574f 100644
--- a/tools.h
+++ b/tools.h
@@ -8,10 +8,10 @@
 #ifndef __EPGFIXER_TOOLS_H_
 #define __EPGFIXER_TOOLS_H_
 
+#include <stdio.h>
+#include <unistd.h>
 #include <vdr/epg.h>
 #include <vdr/tools.h>
-#include <unistd.h>
-#include <stdio.h>
 
 #define error(x...) esyslog("EPGFixer: " x);