Include file re-ordering

- Reorder all included header files to this order:
  * own headers
  * STL headers
  * VDR headers
  * system headers
  This has been done in all source and all own header files.
  Normally the STL headers should have gone after the VDR headers, but due
  to an compilation error with GCC 6 and the definition of swap in vdr/tools.h
  if __STL_CONFIG_H is not defined, the STL headers need to be before the VDR
  headers. Please note, that GCC 4.x, 5.x and 6.x do no longer define
  __STL_CONFIG_H resulting in the definition of swap in vdr/tools.h. This was
  no problem till GCC 6.x. To overcome the error in GCC 6.x, __STL_CONFIG_H
  is now defined in some headers before including a VDR header file, so that
  vdr/tools.h doe not define swap any more.
  Klaus S. might change the definition in vdr/tools.h with the next VDR
  version. So the setting of "__STL_CONFIG_H" may be removed.
- Added all missing system/STL/VDR header files to the own header files,
  so that they can be included as first file.
- Removed all unnecessary header file includes in source and own header
  files.
- Used #include "..." only for header files in the same directory and
  #include <...> for all header files which need to be searched via the -I
  and built in path.

40 files changed, 174 insertions, 287 deletions

diff --git a/pages/channels_widget.ecpp b/pages/channels_widget.ecpp
index d4c06b4..c71506d 100644
--- a/pages/channels_widget.ecpp
+++ b/pages/channels_widget.ecpp
@@ -1,8 +1,7 @@
 <%pre>
-#include <vdr/channels.h>
-#include "exception.h"
-#include "setup.h"
-#include "tools.h"
+
+#include <exception.h>
+#include <setup.h>
 
 using namespace vdrlive;
 
diff --git a/pages/content.ecpp b/pages/content.ecpp
index cde092f..28f43c1 100644
--- a/pages/content.ecpp
+++ b/pages/content.ecpp
@@ -1,9 +1,6 @@
 <%pre>
-#include <string>
-#include <tnt/httperror.h>
-#include <tnt/httpheader.h>
-#include "filecache.h"
-#include "setup.h"
+
+#include <filecache.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/edit_recording.ecpp b/pages/edit_recording.ecpp
index a810908..e3e3deb 100644
--- a/pages/edit_recording.ecpp
+++ b/pages/edit_recording.ecpp
@@ -1,15 +1,11 @@
 <%pre>
+
+#include <tools.h>
+#include <recman.h>
+#include <setup.h>
+#include <users.h>
+
 #include <vdr/recording.h>
-#include <vdr/config.h>
-#include <vdr/i18n.h>
-#include "exception.h"
-#include "tools.h"
-#include "epg_events.h"
-#include "recman.h"
-#include "setup.h"
-#include "i18n.h"
-#include "livefeatures.h"
-#include "users.h"
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp
index a17b9d8..a81a15a 100644
--- a/pages/edit_searchtimer.ecpp
+++ b/pages/edit_searchtimer.ecpp
@@ -1,16 +1,11 @@
 <%pre>
-#include <memory>
-#include <vdr/channels.h>
-#include <vdr/config.h>
-#include <vdr/epg.h>
-#include <vdr/i18n.h>
+
+#include <tools.h>
+#include <epgsearch.h>
+#include <setup.h>
+#include <users.h>
+
 #include <iomanip>
-#include "exception.h"
-#include "tools.h"
-#include "epgsearch.h"
-#include "setup.h"
-#include "i18n.h"
-#include "users.h"
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index ecc8c6e..d080ee5 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -1,24 +1,16 @@
 <%pre>
 
-// To get rid of the swap definition in vdr/tools.h
-#define __STL_CONFIG_H
+#include <tools.h>
+#include <timers.h>
+#include <setup.h>
+#include <epg_events.h>
+#include <timerconflict.h>
+#include <livefeatures.h>
+#include <epgsearch.h>
+#include <users.h>
+#include <autoptr.h>
 
-#include <memory>
-#include <vdr/channels.h>
-#include <vdr/config.h>
-#include <vdr/epg.h>
-#include <vdr/i18n.h>
-#include "exception.h"
-#include "tools.h"
-#include "timers.h"
-#include "setup.h"
-#include "epg_events.h"
-#include "timerconflict.h"
-#include "i18n.h"
-#include "livefeatures.h"
-#include "epgsearch.h"
-#include "users.h"
-#include "autoptr.h"
+#include <vdr/timers.h>
 
 using namespace std;
 using namespace vdrlive;
@@ -226,15 +218,15 @@ cTimer* timer;
 					</tr>
 <%cpp>
 					if ( LiveFeatures< features::epgsearch >().Recent() ) {
-					        RecordingDirs recordingdirs(true);
+						RecordingDirs recordingdirs(true);
 </%cpp>
 					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("Directory" ) $>:</div></td>
 						<td class="rightcol"><select name="directory" size="1" id="directory" style="margin-top: 5px">
 						     <option/>
 <%cpp>
-					             for (RecordingDirs::iterator rdir = recordingdirs.begin(); rdir != recordingdirs.end(); ++rdir) {
-						        std::string dir = *rdir;
+						for (RecordingDirs::iterator rdir = recordingdirs.begin(); rdir != recordingdirs.end(); ++rdir) {
+							std::string dir = *rdir;
 </%cpp>
 							<option value="<$ dir $>"
 %							if (*rdir == directory) {
diff --git a/pages/edit_user.ecpp b/pages/edit_user.ecpp
index e1d977c..ac7ba86 100644
--- a/pages/edit_user.ecpp
+++ b/pages/edit_user.ecpp
@@ -1,9 +1,8 @@
 <%pre>
-#include "exception.h"
-#include "tools.h"
-#include "users.h"
-#include "livefeatures.h"
-#include "setup.h"
+
+#include <users.h>
+#include <livefeatures.h>
+#include <setup.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/epginfo.ecpp b/pages/epginfo.ecpp
index 77d2f91..91e72f9 100644
--- a/pages/epginfo.ecpp
+++ b/pages/epginfo.ecpp
@@ -1,13 +1,11 @@
 <%pre>
-#include <sys/stat.h>
-#include <vdr/tools.h>
-
-#include "stdext.h"
-#include "exception.h"
-#include "setup.h"
-#include "tools.h"
-#include "epg_events.h"
-#include "recman.h"
+
+#include <stdext.h>
+#include <exception.h>
+#include <setup.h>
+#include <tools.h>
+#include <epg_events.h>
+#include <recman.h>
 
 namespace vdrlive {
 	class SchedulesLock
diff --git a/pages/error.ecpp b/pages/error.ecpp
index df24dd4..ed68b89 100644
--- a/pages/error.ecpp
+++ b/pages/error.ecpp
@@ -1,6 +1,6 @@
 <%pre>
-#include <vdr/i18n.h>
-#include "setup.h"
+
+#include <setup.h>
 
 using namespace vdrlive;
 
diff --git a/pages/event_widget.ecpp b/pages/event_widget.ecpp
index b4a80cb..db8538d 100644
--- a/pages/event_widget.ecpp
+++ b/pages/event_widget.ecpp
@@ -1,10 +1,6 @@
 <%pre>
-#include <vdr/plugin.h>
-#include <vdr/channels.h>
-#include <vdr/epg.h>
-#include <vdr/config.h>
-#include <vdr/i18n.h>
-#include "tools.h"
+
+#include <setup.h>
 
 using namespace vdrlive;
 
diff --git a/pages/ffw_recording.ecpp b/pages/ffw_recording.ecpp
index 5b2d8bc..9d746f1 100644
--- a/pages/ffw_recording.ecpp
+++ b/pages/ffw_recording.ecpp
@@ -1,10 +1,7 @@
 <%pre>
-#include <string>
-#include <vdr/recording.h>
-#include "exception.h"
-#include "setup.h"
-#include "tasks.h"
-#include "tools.h"
+
+#include <setup.h>
+#include <tasks.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/ibox.ecpp b/pages/ibox.ecpp
index 5e714b0..947b746 100644
--- a/pages/ibox.ecpp
+++ b/pages/ibox.ecpp
@@ -1,17 +1,12 @@
 <%pre>
-#include <vdr/plugin.h>
-#include <vdr/config.h>
-#include <vdr/recording.h>
-#include <vdr/channels.h>
+
+#include <setup.h>
+#include <tools.h>
+#include <epg_events.h>
+#include <recman.h>
+#include <timerconflict.h>
+
 #include <vdr/menu.h>
-#include <vdr/device.h>
-
-#include "exception.h"
-#include "setup.h"
-#include "tools.h"
-#include "epg_events.h"
-#include "recman.h"
-#include "timerconflict.h"
 
 using namespace vdrlive;
 using namespace std;
diff --git a/pages/keypress.ecpp b/pages/keypress.ecpp
index efcb1a3..16ddd4f 100644
--- a/pages/keypress.ecpp
+++ b/pages/keypress.ecpp
@@ -1,6 +1,8 @@
 <%pre>
+
+#include <setup.h>
+
 #include <vdr/remote.h>
-#include "setup.h"
 
 using namespace vdrlive;
 
diff --git a/pages/login.ecpp b/pages/login.ecpp
index a49f1fa..f7e6a17 100644
--- a/pages/login.ecpp
+++ b/pages/login.ecpp
@@ -1,7 +1,7 @@
 <%pre>
-#include "tools.h"
-#include "setup.h"
-#include "users.h"
+
+#include <setup.h>
+#include <users.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index 74ff1b9..6251ec7 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -1,12 +1,8 @@
 <%pre>
-#include <string>
-#include <vdr/plugin.h>
-#include <vdr/config.h>
 
-#include "livefeatures.h"
-#include "setup.h"
-#include "i18n.h"
-#include "timerconflict.h"
+#include <livefeatures.h>
+#include <setup.h>
+#include <timerconflict.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index f84287a..22a3f07 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -1,17 +1,10 @@
 <%pre>
-#include <list>
-#include <vdr/plugin.h>
-#include <vdr/channels.h>
-#include <vdr/epg.h>
-#include <vdr/config.h>
-#include <vdr/device.h>
-#include "exception.h"
-#include "livefeatures.h"
-#include "setup.h"
-#include "tools.h"
-#include "timers.h"
-#include "epg_events.h"
-#include "i18n.h"
+
+#include <livefeatures.h>
+#include <setup.h>
+#include <tools.h>
+#include <timers.h>
+#include <epg_events.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/osd.ecpp b/pages/osd.ecpp
index b7cf24a..1a8aba7 100644
--- a/pages/osd.ecpp
+++ b/pages/osd.ecpp
@@ -1,13 +1,7 @@
 <%pre>
-#include <locale>
-#include <vdr/i18n.h>
-#include <vdr/keys.h>
-#include <vdr/device.h>
-#include "grab.h"
-#include "setup.h"
-#include "tools.h"
-#include "users.h"
-#include "osd_status.h"
+
+#include <setup.h>
+#include <osd_status.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/page_exit.eh b/pages/page_exit.eh
index 319260e..fb83055 100644
--- a/pages/page_exit.eh
+++ b/pages/page_exit.eh
@@ -1,6 +1,6 @@
 <# do not add to Makefile #>
 <%pre>
-#include "exception.h"
+#include <exception.h>
 </%pre>
 <%cpp>
 	spoint.commit();
diff --git a/pages/page_init.eh b/pages/page_init.eh
index 5a367df..da4374e 100644
--- a/pages/page_init.eh
+++ b/pages/page_init.eh
@@ -1,9 +1,9 @@
 <%pre>
 // do not add to Makefile
 // and do not write a ecpp comment into this file. It must produce no
-// html output not even a empty line.
+// html output not even an empty line.
 #include <tnt/savepoint.h>
-#include "exception.h"
+#include <exception.h>
 </%pre>
 <%request scope="global">
 std::string pageTitle;
@@ -12,4 +12,4 @@ std::string pageTitle;
 try {
 	reply.setHeader("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
 	tnt::Savepoint spoint( reply );
-</%cpp>
\ No newline at end of file
+</%cpp>
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index bbb8f38..1f96399 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -1,17 +1,12 @@
 <%pre>
-#include <string>
-#include <vdr/menu.h>
-#include <vdr/epg.h>
-#include "exception.h"
-#include "livefeatures.h"
-#include "tntfeatures.h"
-#include "i18n.h"
-#include "setup.h"
-#include "timers.h"
-#include "tools.h"
-#include "epg_events.h"
-#include "gen_version_suffix.h"
 
+#include <livefeatures.h>
+#include <setup.h>
+#include <timers.h>
+#include <tools.h>
+#include <epg_events.h>
+#include <gen_version_suffix.h>
+//
 using namespace std;
 using namespace vdrlive;
 
diff --git a/pages/pause_recording.ecpp b/pages/pause_recording.ecpp
index 1208a42..00ea269 100644
--- a/pages/pause_recording.ecpp
+++ b/pages/pause_recording.ecpp
@@ -1,10 +1,7 @@
 <%pre>
-#include <string>
-#include <vdr/recording.h>
-#include "exception.h"
-#include "setup.h"
-#include "tasks.h"
-#include "tools.h"
+
+#include <setup.h>
+#include <tasks.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/play_recording.ecpp b/pages/play_recording.ecpp
index 1f018de..6ecb7db 100644
--- a/pages/play_recording.ecpp
+++ b/pages/play_recording.ecpp
@@ -1,11 +1,9 @@
 <%pre>
-#include <string>
-#include <vdr/recording.h>
-#include "exception.h"
-#include "setup.h"
-#include "tasks.h"
-#include "tools.h"
-#include "users.h"
+
+#include <setup.h>
+#include <tasks.h>
+#include <users.h>
+#include <exception.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 1693e2a..615fb7c 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -1,25 +1,18 @@
 <%pre>
-#include <string>
+
+#include <setup.h>
+#include <tasks.h>
+#include <tools.h>
+#include <users.h>
+#include <recman.h>
+#include <tntconfig.h>
 
 #ifdef HAVE_LIBPCRECPP
 #include <pcrecpp.h>
 #endif
 
-#include <vdr/plugin.h>
-#include <vdr/config.h>
 #include <vdr/videodir.h>
 
-#include "exception.h"
-#include "epg_events.h"
-
-#include "setup.h"
-#include "tasks.h"
-#include "tools.h"
-#include "i18n.h"
-#include "users.h"
-
-#include "recman.h"
-
 #define MB_PER_MINUTE 25.75 // this is just an estimate!
 
 using namespace vdrlive;
diff --git a/pages/recstream.ecpp b/pages/recstream.ecpp
index 61a48e1..5e7614b 100644
--- a/pages/recstream.ecpp
+++ b/pages/recstream.ecpp
@@ -1,14 +1,6 @@
 <%pre>
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <algorithm>
-#include <tnt/httperror.h>
-#include <tnt/httpheader.h>
-#include <vdr/recording.h>
-#include "tntfeatures.h"
-#include "setup.h"
-#include "recman.h"
+
+#include <recman.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index d76b208..0c46f69 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -1,12 +1,9 @@
 <%pre>
-#include <locale>
-#include <vdr/i18n.h>
-#include <vdr/keys.h>
-#include <vdr/device.h>
-#include "grab.h"
-#include "setup.h"
-#include "tools.h"
-#include "users.h"
+
+#include <grab.h>
+#include <setup.h>
+#include <tools.h>
+#include <users.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/rwd_recording.ecpp b/pages/rwd_recording.ecpp
index a0ce569..d568cf3 100644
--- a/pages/rwd_recording.ecpp
+++ b/pages/rwd_recording.ecpp
@@ -1,10 +1,7 @@
 <%pre>
-#include <string>
-#include <vdr/recording.h>
-#include "exception.h"
-#include "setup.h"
-#include "tasks.h"
-#include "tools.h"
+
+#include <setup.h>
+#include <tasks.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index 96d9427..c5e5979 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -1,15 +1,9 @@
 <%pre>
-#include <vdr/plugin.h>
-#include <vdr/channels.h>
-#include <vdr/epg.h>
-#include <vdr/config.h>
-#include <vdr/device.h>
-#include "exception.h"
-#include "livefeatures.h"
-#include "setup.h"
-#include "tools.h"
-#include "epg_events.h"
-#include "i18n.h"
+
+#include <livefeatures.h>
+#include <setup.h>
+#include <tools.h>
+#include <epg_events.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/screenshot.ecpp b/pages/screenshot.ecpp
index c80c1c8..fbdca02 100644
--- a/pages/screenshot.ecpp
+++ b/pages/screenshot.ecpp
@@ -1,7 +1,7 @@
 <%pre>
-#include <vdr/config.h>
-#include "setup.h"
-#include "grab.h"
+
+#include <setup.h>
+#include <grab.h>
 
 using namespace vdrlive;
 
diff --git a/pages/searchepg.ecpp b/pages/searchepg.ecpp
index 18e8f2e..9d9c79a 100644
--- a/pages/searchepg.ecpp
+++ b/pages/searchepg.ecpp
@@ -1,14 +1,8 @@
 <%pre>
-#include <memory>
-#include <vdr/channels.h>
-#include <vdr/config.h>
-#include <vdr/epg.h>
-#include <vdr/i18n.h>
-#include <iomanip>
-#include "exception.h"
-#include "tools.h"
-#include "epgsearch.h"
-#include "setup.h"
+
+#include <tools.h>
+#include <epgsearch.h>
+#include <setup.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/searchresults.ecpp b/pages/searchresults.ecpp
index 695a7cd..8970f37 100644
--- a/pages/searchresults.ecpp
+++ b/pages/searchresults.ecpp
@@ -1,11 +1,9 @@
 <%pre>
-#include <vdr/channels.h>
-#include <vdr/i18n.h>
-#include <vdr/epg.h>
-#include "epgsearch.h"
-#include "tools.h"
-#include "setup.h"
-#include "epg_events.h"
+
+#include <epgsearch.h>
+#include <tools.h>
+#include <setup.h>
+#include <epg_events.h>
 
 using namespace vdrlive;
 using namespace std;
diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp
index dc8bc53..0ed3acc 100644
--- a/pages/searchtimers.ecpp
+++ b/pages/searchtimers.ecpp
@@ -1,10 +1,8 @@
 <%pre>
-#include <vdr/channels.h>
-#include <vdr/i18n.h>
-#include "epgsearch.h"
-#include "tools.h"
-#include "setup.h"
-#include "users.h"
+
+#include <epgsearch.h>
+#include <setup.h>
+#include <users.h>
 
 using namespace vdrlive;
 using namespace std;
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 264839b..b87b0db 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -1,10 +1,9 @@
 <%pre>
-#include <sys/stat.h>
-#include <vdr/tools.h>
-#include "setup.h"
-#include "tools.h"
-#include "users.h"
-#include "i18n.h"
+
+#include <setup.h>
+#include <tools.h>
+#include <users.h>
+#include <live.h>
 
 using namespace vdrlive;
 using namespace std;
diff --git a/pages/stop_recording.ecpp b/pages/stop_recording.ecpp
index 869beb0..00be32f 100644
--- a/pages/stop_recording.ecpp
+++ b/pages/stop_recording.ecpp
@@ -1,10 +1,7 @@
 <%pre>
-#include <string>
-#include <vdr/recording.h>
-#include "exception.h"
-#include "setup.h"
-#include "tasks.h"
-#include "tools.h"
+
+#include <setup.h>
+#include <tasks.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/switch_channel.ecpp b/pages/switch_channel.ecpp
index 2cffefc..79a6466 100644
--- a/pages/switch_channel.ecpp
+++ b/pages/switch_channel.ecpp
@@ -1,9 +1,9 @@
 <%pre>
-#include <vdr/channels.h>
-#include "exception.h"
-#include "tasks.h"
-#include "tools.h"
-#include "users.h"
+
+#include <exception.h>
+#include <tasks.h>
+#include <tools.h>
+#include <users.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp
index b6c34f0..61e7338 100644
--- a/pages/timerconflicts.ecpp
+++ b/pages/timerconflicts.ecpp
@@ -1,12 +1,10 @@
 <%pre>
-#include <vdr/channels.h>
-#include <vdr/i18n.h>
-#include "timerconflict.h"
-#include "tools.h"
-#include "setup.h"
-#include "epg_events.h"
-#include "timers.h"
-#include "i18n.h"
+
+#include <timerconflict.h>
+#include <tools.h>
+#include <setup.h>
+#include <epg_events.h>
+#include <timers.h>
 
 using namespace vdrlive;
 using namespace std;
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index 9f5632c..771a907 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -1,14 +1,12 @@
 <%pre>
-#include <set>
-#include <vdr/i18n.h>
-#include "timers.h"
-#include "tools.h"
-#include "setup.h"
-#include "i18n.h"
-#include "epg_events.h"
-#include "timerconflict.h"
-#include "livefeatures.h"
-#include "users.h"
+
+#include <timers.h>
+#include <tools.h>
+#include <setup.h>
+#include <epg_events.h>
+#include <timerconflict.h>
+#include <livefeatures.h>
+#include <users.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp
index e7ddaa6..ed1a31a 100644
--- a/pages/tooltip.ecpp
+++ b/pages/tooltip.ecpp
@@ -1,5 +1,6 @@
 <%pre>
-#include "setup.h"
+
+#include <setup.h>
 
 using namespace vdrlive;
 
diff --git a/pages/users.ecpp b/pages/users.ecpp
index 9e00602..f8bc546 100644
--- a/pages/users.ecpp
+++ b/pages/users.ecpp
@@ -1,8 +1,7 @@
 <%pre>
-#include <vdr/channels.h>
-#include <vdr/i18n.h>
-#include "users.h"
-#include "setup.h"
+
+#include <users.h>
+#include <setup.h>
 
 using namespace vdrlive;
 using namespace std;
diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp
index 59baa72..39cfb67 100644
--- a/pages/vlc.ecpp
+++ b/pages/vlc.ecpp
@@ -1,11 +1,8 @@
 <%pre>
-#include <vdr/channels.h>
-#include <vdr/i18n.h>
-#include <vdr/keys.h>
-#include "setup.h"
-#include "tools.h"
-#include "users.h"
-#include "tntfeatures.h"
+
+#include <setup.h>
+#include <tools.h>
+#include <users.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 444b845..bc58687 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -1,14 +1,10 @@
 <%pre>
-#include <vdr/plugin.h>
-#include <vdr/channels.h>
-#include <vdr/epg.h>
-#include <vdr/config.h>
-#include <vdr/i18n.h>
-#include "livefeatures.h"
-#include "setup.h"
-#include "tools.h"
-#include "epg_events.h"
-#include "epgsearch.h"
+
+#include <livefeatures.h>
+#include <setup.h>
+#include <tools.h>
+#include <epg_events.h>
+#include <epgsearch.h>
 
 using namespace std;
 using namespace vdrlive;
diff --git a/pages/xmlresponse.ecpp b/pages/xmlresponse.ecpp
index bf0a6c1..40eca86 100644
--- a/pages/xmlresponse.ecpp
+++ b/pages/xmlresponse.ecpp
@@ -1,6 +1,6 @@
 <%pre>
-#include <string>
-#include "i18n.h"
+
+#include <i18n.h>
 
 using namespace std;
 using namespace vdrlive;