1 files changed, 8 insertions, 4 deletions
diff --git a/live.h b/live.h
index 93e441d..bf874be 100644
--- a/live.h
+++ b/live.h
@@ -1,12 +1,16 @@
 #ifndef VDR_LIVE_LIVE_H
 #define VDR_LIVE_LIVE_H
 
-#include <memory>
+#include "thread.h"
+
+// STL headers need to be before VDR tools.h (included by <vdr/plugin.h>)
 #include <string>
-#include <vdr/config.h>
+
+#ifndef __STL_CONFIG_H
+// To get rid of the swap definition in vdr/tools.h
+# define __STL_CONFIG_H
+#endif
 #include <vdr/plugin.h>
-#include "thread.h"
-#include "autoptr.h"
 
 namespace vdrlive {