diff --git a/src/chatcleaner/cleanerconfig.cpp b/src/chatcleaner/cleanerconfig.cpp
index cee11f61..26492dbc 100644
--- a/src/chatcleaner/cleanerconfig.cpp
+++ b/src/chatcleaner/cleanerconfig.cpp
@@ -29,6 +29,8 @@
  * as that of the covered work.                                              *
  *****************************************************************************/
 #include "cleanerconfig.h"
+#include <QtCore>
+
 #include <tinyxml.h>
 
 #define MODUS 0711
@@ -46,8 +48,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <QtCore>
-
 using namespace std;
 
 
diff --git a/src/chatcleaner/cleanerserver.cpp b/src/chatcleaner/cleanerserver.cpp
index 34066149..3e59f174 100644
--- a/src/chatcleaner/cleanerserver.cpp
+++ b/src/chatcleaner/cleanerserver.cpp
@@ -77,7 +77,9 @@ CleanerServer::~CleanerServer()
 
 void CleanerServer::newCon()
 {
-	if(!blockConnection) {
+	if(blockConnection) {
+		tcpServer->nextPendingConnection()->close();
+	} else {
 		tcpSocket = tcpServer->nextPendingConnection();
 		connect(tcpSocket, SIGNAL(readyRead()), this, SLOT(onRead()));
 		connect(tcpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
@@ -113,6 +115,7 @@ void CleanerServer::onRead()
 	if (error) {
 		qDebug() << "Error handling packets from client.";
 		tcpSocket->close();
+		blockConnection = false;
 	}
 
 	/*	char buf[1024];
diff --git a/src/chatcleaner/messagefilter.h b/src/chatcleaner/messagefilter.h
index cabb5bac..f26023b7 100644
--- a/src/chatcleaner/messagefilter.h
+++ b/src/chatcleaner/messagefilter.h
@@ -33,7 +33,9 @@
 
 #include <QtCore>
 #include <stdlib.h>
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 
 class BadWordCheck;
 class TextFloodCheck;
diff --git a/src/chatcleaner/textfloodcheck.h b/src/chatcleaner/textfloodcheck.h
index 229cf145..29b3cf38 100644
--- a/src/chatcleaner/textfloodcheck.h
+++ b/src/chatcleaner/textfloodcheck.h
@@ -32,7 +32,9 @@
 #define TEXTFLOODCHECK_H
 
 #include <QtCore>
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 #include <stdlib.h>