diff -Naur wetter-/OsdWeather.c wetter/OsdWeather.c
--- wetter-/OsdWeather.c	Sun Jan 30 13:53:58 2005
+++ wetter/OsdWeather.c	Wed Feb 16 15:17:38 2005
@@ -5,8 +5,8 @@
 #include <vdr/config.h>
 #include "img/bitmap.h"
 #include "getdata.h"
-#include <vdr/plugin.h>
 #include "i18n.h"
+#include <vdr/plugin.h>
 
 const int MAX_LOGO_COLORS=16;
 
diff -Naur wetter-/OsdWeather.h wetter/OsdWeather.h
--- wetter-/OsdWeather.h	Sat Jan 22 19:47:34 2005
+++ wetter/OsdWeather.h	Wed Feb 16 15:17:58 2005
@@ -3,6 +3,8 @@
 #include <string>
 #include <vdr/plugin.h>
 #include "setup.h"
+#include <vdr/plugin.h>
+
 class cWetterOsd : public cOsdObject {
 private:
   std::string code,file,plugindir;
diff -Naur wetter-/contrib/HttpGetSocket.h wetter/contrib/HttpGetSocket.h
--- wetter-/contrib/HttpGetSocket.h	Mon Jan 17 21:04:41 2005
+++ wetter/contrib/HttpGetSocket.h	Wed Feb 16 15:23:49 2005
@@ -20,6 +20,11 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+
+// #include <stdarg.h>
+#include <stdio.h>
+// #include <stdlib.h>
+
 #ifndef _HTTPGETSOCKET_H
 #define _HTTPGETSOCKET_H
 
diff -Naur wetter-/contrib/HttpGetSocket.h~ wetter/contrib/HttpGetSocket.h~
--- wetter-/contrib/HttpGetSocket.h~	Thu Jan  1 01:00:00 1970
+++ wetter/contrib/HttpGetSocket.h~	Wed Feb 16 15:21:55 2005
@@ -0,0 +1,72 @@
+/**
+ **	File ......... HttpGetSocket.h
+ **	Published ....  2004-02-13
+ **	Author ....... grymse@alhem.net
+**/
+/*
+Copyright (C) 2004  Anders Hedstrom
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+#ifndef _HTTPGETSOCKET_H
+#define _HTTPGETSOCKET_H
+
+#include "HTTPSocket.h"
+
+
+class HttpGetSocket : public HTTPSocket
+{
+public:
+	HttpGetSocket(SocketHandler&,const std::string& ,const std::string& = "");
+	HttpGetSocket(SocketHandler&,const std::string&,port_t,const std::string&,const std::string&);
+	~HttpGetSocket();
+
+	void OnConnect();
+	void OnContent();
+	void OnDelete();
+
+	void OnFirst();
+	void OnHeader(const std::string& ,const std::string& );
+	void OnHeaderComplete();
+	void OnData(const char *,size_t);
+
+	bool Complete() { return m_bComplete; }
+
+	size_t GetContentLength() { return m_content_length; }
+	size_t GetPos() { return m_content_ptr; }
+
+	void url_this(const std::string& url_in,std::string& host,port_t& port,std::string& url,std::string& file);
+
+protected:
+	HttpGetSocket(const HttpGetSocket& s) : HTTPSocket(s) {}
+private:
+	HttpGetSocket& operator=(const HttpGetSocket& ) { return *this; }
+	std::string m_host;
+	port_t m_port;
+	std::string m_url;
+	std::string m_to_file;
+	//
+	FILE *m_fil;
+	bool m_bComplete;
+	//
+	size_t m_content_length;
+	std::string m_content_type;
+	size_t m_content_ptr;
+};
+
+
+
+
+#endif // _HTTPGETSOCKET_H
diff -Naur wetter-/parsing.c wetter/parsing.c
--- wetter-/parsing.c	Sun Jan 30 13:52:52 2005
+++ wetter/parsing.c	Wed Feb 16 15:19:01 2005
@@ -5,11 +5,11 @@
 #include "parsing.h"
 
 #include "xml.h"
-#include <vdr/tools.h>
 #include <stdio.h>
 #include <vector>
 #include <string>
 #include "getdata.h"
+#include <vdr/tools.h>
 
 
 #define TAG_ERR_REMAIN(_context) do { \
diff -Naur wetter-/parsing.h wetter/parsing.h
--- wetter-/parsing.h	Sat Feb  5 16:07:05 2005
+++ wetter/parsing.h	Wed Feb 16 15:19:12 2005
@@ -7,11 +7,11 @@
 
 #include "parsing.h"
 #include "xml.h"
-#include <vdr/tools.h>
 #include <stdio.h>
 #include <vector>
 #include <string>
 #include "getdata.h"
+#include <vdr/tools.h>
 
 
 class cxmlParse {
diff -Naur wetter-/skin.h wetter/skin.h
--- wetter-/skin.h	Mon Jan 17 21:03:09 2005
+++ wetter/skin.h	Wed Feb 16 15:19:34 2005
@@ -6,10 +6,10 @@
 #define VDR_TEXT2SKIN_XML_SKIN_H 
 
 #include "xml/display.h"
-#include <vdr/osd.h>
 #include <expat.h>
 #include <map>
 #include <string>
+#include <vdr/osd.h>
 
 // --- cxSkin -----------------------------------------------------------------
 
diff -Naur wetter-/wetter.h wetter/wetter.h
--- wetter-/wetter.h	Sun Feb 13 20:46:24 2005
+++ wetter/wetter.h	Wed Feb 16 15:19:51 2005
@@ -1,12 +1,14 @@
 
-#include <vdr/plugin.h>
 #include "i18n.h"
 #include "parser.h"
 #include <string>
 #include <vector>
-#include <vdr/osd.h>
 #include "OsdWeather.h"
 #include "i18n.h"
+
+#include <vdr/plugin.h>
+#include <vdr/osd.h>
+
 
 static const char *VERSION        = "0.0.1";
 static const char *DESCRIPTION    = "Display Weather in OSD.";