--- libretroshare/src/retroshare/rsconfig.h.orig
+++ libretroshare/src/retroshare/rsconfig.h
@@ -31,6 +31,8 @@
 #include <list>
 #include <map>
 
+#include <time.h>
+
 /* The New Config Interface Class */
 class RsServerConfig;
 extern RsServerConfig *rsConfig;
--- libretroshare/src/retroshare/rsflags.h.orig
+++ libretroshare/src/retroshare/rsflags.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <ostream>
 
 // This class provides a representation for flags that can be combined with bitwise
 // operations. However, because the class is templated with an id, it's not possible to 
--- libretroshare/src/retroshare/rsgxsifacetypes.h.orig
+++ libretroshare/src/retroshare/rsgxsifacetypes.h
@@ -12,6 +12,8 @@
 #include <vector>
 #include <string>
 #include <inttypes.h>
+
+#include <time.h>
 
 
 typedef std::string RsGxsGroupId;
--- plugins/FeedReader/interface/rsFeedReader.h.orig
+++ plugins/FeedReader/interface/rsFeedReader.h
@@ -26,6 +26,8 @@
 #include <string>
 #include <list>
 
+#include <time.h>
+
 class RsFeedReader;
 extern RsFeedReader *rsFeedReader;
 
--- plugins/LinksCloud/rsrank.h.orig
+++ plugins/LinksCloud/rsrank.h
@@ -30,6 +30,8 @@
 #include <string>
 #include <list>
 
+#include <time.h>
+
 /* The Main Interface Class - for information about your Peers */
 class RsRanks;
 extern RsRanks   *rsRanks;
--- retroshare-gui/src/gui/CreateMsgLinkDialog.h.orig
+++ retroshare-gui/src/gui/CreateMsgLinkDialog.h
@@ -23,6 +23,8 @@
 
 #include "ui_CreateMsgLinkDialog.h"
 
+#include <time.h>
+
 class FriendSelectionWidget ;
 
 class CreateMsgLinkDialog : public QDialog, public Ui::CreateMsgLinkDialog
--- retroshare-gui/src/gui/RetroShareLink.h.orig
+++ retroshare-gui/src/gui/RetroShareLink.h
@@ -33,6 +33,7 @@
 //    -------------+----------------+--------------------------+------------------+-------------+-------------
 //
 #include <stdint.h>
+#include <time.h>
 #include <QString>
 #include <QVector>
 #include <QUrl>
--- retroshare-gui/src/gui/common/GroupTreeWidget.cpp.orig
+++ retroshare-gui/src/gui/common/GroupTreeWidget.cpp
@@ -502,7 +502,7 @@ void GroupTreeWidget::calculateScore(QTr
 
 	/* Find out which has given word in it */
 	QTreeWidgetItemIterator itemIterator(ui->treeWidget);
-	QTreeWidgetItem *item;
+	// QTreeWidgetItem *item;
 	while ((item = *itemIterator) != NULL) {
 		itemIterator++;
 
--- retroshare-gui/src/gui/connect/ConnectProgressDialog.h.orig
+++ retroshare-gui/src/gui/connect/ConnectProgressDialog.h
@@ -29,6 +29,7 @@
 #include "ui_ConnectProgressDialog.h"
 
 #include <stdint.h>
+#include <time.h>
 
 class ConnectProgressDialog : public QDialog
 {
--- retroshare-gui/src/./util/DateTime.h.orig
+++ retroshare-gui/src/./util/DateTime.h
@@ -24,6 +24,8 @@
 
 #include <QString>
 
+#include <time.h>
+
 class QDateTime;
 class QDate;
 class QTime;
--- libretroshare/src/util/argstream.h.orig
+++ libretroshare/src/util/argstream.h
@@ -141,9 +141,9 @@ namespace 
 			inline OptionHolder(char s,
 					const char* l,
 					const char* desc);  
-			friend OptionHolder help(char s='h',
-					const char* l="help",
-					const char* desc="Display this help");
+			friend OptionHolder help(char s,
+					const char* l,
+					const char* desc);
 		private:
 			std::string shortName_;
 			std::string longName_;
@@ -173,9 +173,9 @@ namespace 
 			return OptionHolder(l,b,desc);
 		}
 	inline OptionHolder
-		help(char s,
-				const char* l,
-				const char* desc)
+		help(char s='h',
+				const char* l="help",
+				const char* desc="Display this help")
 		{
 			return OptionHolder(s,l,desc);
 		}
--- retroshare-nogui/src/menu/menu.h.orig	2014-01-28 22:57:11.000000000 +0100
+++ retroshare-nogui/src/menu/menu.h	2014-04-10 13:51:23.670843012 +0200
@@ -27,6 +27,7 @@
 #define RSNOGUI_MENU_H
 
 #include <inttypes.h>
+#include <time.h>
 
 #include <string>
 #include <map>