diff --git a/src/chatcleaner/cleanerconfig.cpp b/src/chatcleaner/cleanerconfig.cpp
index 2172a168..f6423546 100644
--- a/src/chatcleaner/cleanerconfig.cpp
+++ b/src/chatcleaner/cleanerconfig.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "cleanerconfig.h"
-#include "tinyxml.h"
+#include <tinyxml.h>
 
 #define MODUS 0711
 
diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 56947e5a..60a27b9e 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -20,7 +20,7 @@
 #include "configfile.h"
 #include <qttoolsinterface.h>
 #include <core/loghelper.h>
-#include "tinyxml.h"
+#include <tinyxml.h>
 
 #define MODUS 0711
 
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 3990c6f4..7a327e24 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -50,7 +50,7 @@
 
 #include <net/socket_msg.h>
 
-#include "math.h"
+#include <cmath>
 
 #define FORMATLEFT(X) "<p align='center'>(X)"
 #define FORMATRIGHT(X) "(X)</p>"
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index b5318672..9a123392 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -20,7 +20,7 @@
 #include "joinnetworkgamedialogimpl.h"
 #include "session.h"
 #include "configfile.h"
-#include "tinyxml.h"
+#include <tinyxml.h>
 #include <net/socket_startup.h>
 
 using namespace std;
diff --git a/src/gui/qt/styles/carddeckstylereader.h b/src/gui/qt/styles/carddeckstylereader.h
index fb2d2ee4..05fc2670 100644
--- a/src/gui/qt/styles/carddeckstylereader.h
+++ b/src/gui/qt/styles/carddeckstylereader.h
@@ -20,7 +20,7 @@
 #ifndef CARDDECKSTYLEREADER_H
 #define CARDDECKSTYLEREADER_H
 
-#include "tinyxml.h"
+#include <tinyxml.h>
 #include "configfile.h"
 #include <string>
 #include <QtCore>
diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h
index e9780fe4..f677124a 100644
--- a/src/gui/qt/styles/gametablestylereader.h
+++ b/src/gui/qt/styles/gametablestylereader.h
@@ -20,7 +20,7 @@
 #ifndef GAMETABLESTYLEREADER_H
 #define GAMETABLESTYLEREADER_H
 
-#include "tinyxml.h"
+#include <tinyxml.h>
 #include "configfile.h"
 #include "gametableimpl.h"
 #include "mymessagedialogimpl.h"
diff --git a/src/net/common/chatcleanermanager.cpp b/src/net/common/chatcleanermanager.cpp
index 987ec7fe..3e79a9b2 100644
--- a/src/net/common/chatcleanermanager.cpp
+++ b/src/net/common/chatcleanermanager.cpp
@@ -31,7 +31,8 @@ using boost::asio::ip::tcp;
 
 
 ChatCleanerManager::ChatCleanerManager(ChatCleanerCallback &cb, boost::shared_ptr<boost::asio::io_service> ioService)
-: m_callback(cb), m_ioService(ioService), m_connected(false), m_curRequestId(0), m_recvBufUsed(0)
+: m_callback(cb), m_ioService(ioService), m_connected(false), m_curRequestId(0), m_serverPort(0), m_useIpv6(false),
+  m_recvBufUsed(0)
 {
 	m_resolver.reset(
 		new boost::asio::ip::tcp::resolver(*m_ioService));
diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
index 9c667865..4a3c8def 100644
--- a/src/net/common/clientstate.cpp
+++ b/src/net/common/clientstate.cpp
@@ -35,7 +35,7 @@
 #include <game.h>
 #include <playerinterface.h>
 
-#include "tinyxml.h"
+#include <tinyxml.h>
 #include "zlib.h"
 #include <boost/bind.hpp>
 #include <boost/iostreams/filtering_streambuf.hpp>
diff --git a/src/net/common/sessionmanager.cpp b/src/net/common/sessionmanager.cpp
index 38037019..520fbeb0 100644
--- a/src/net/common/sessionmanager.cpp
+++ b/src/net/common/sessionmanager.cpp
@@ -92,7 +92,7 @@ SessionManager::GetSessionById(SessionId id) const
 }
 
 SessionWrapper
-SessionManager::GetSessionByPlayerName(const string playerName) const
+SessionManager::GetSessionByPlayerName(const string &playerName) const
 {
 	SessionWrapper tmpSession;
 	boost::recursive_mutex::scoped_lock lock(m_sessionMapMutex);
diff --git a/src/net/sessionmanager.h b/src/net/sessionmanager.h
index df8e4a8c..855ae2cd 100644
--- a/src/net/sessionmanager.h
+++ b/src/net/sessionmanager.h
@@ -54,7 +54,7 @@ public:
 	bool RemoveSession(SessionId session);
 
 	SessionWrapper GetSessionById(SessionId id) const;
-	SessionWrapper GetSessionByPlayerName(const std::string playerName) const;
+	SessionWrapper GetSessionByPlayerName(const std::string &playerName) const;
 	SessionWrapper GetSessionByUniquePlayerId(unsigned uniqueId, bool initSessions = false) const;
 
 	PlayerDataList GetPlayerDataList() const;