4 files changed, 7 insertions, 8 deletions
diff --git a/src/shared/cpaster/cgi.cpp b/src/shared/cpaster/cgi.cpp
index f79ba3943f7..acc1e04682f 100644
--- a/src/shared/cpaster/cgi.cpp
+++ b/src/shared/cpaster/cgi.cpp
@@ -33,10 +33,9 @@
 
 #include "cgi.h"
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
-
-const char *cgi_chars = "0123456789abcdef"; // RFC 1738 suggests lower-case to be optimal
+const char cgi_chars[] = "0123456789abcdef"; // RFC 1738 suggests lower-case to be optimal
 
 QString CGI::encodeURL(const QString &rawText)
 {
diff --git a/src/shared/cpaster/cgi.h b/src/shared/cpaster/cgi.h
index 2034470de76..5c9bf5edfe3 100644
--- a/src/shared/cpaster/cgi.h
+++ b/src/shared/cpaster/cgi.h
@@ -34,7 +34,7 @@
 #ifndef CGI_H
 #define CGI_H
 
-#include <QString>
+#include <QtCore/QString>
 
 class CGI
 {
diff --git a/src/shared/cpaster/splitter.cpp b/src/shared/cpaster/splitter.cpp
index 711248d3dfb..cb04c38acb9 100644
--- a/src/shared/cpaster/splitter.cpp
+++ b/src/shared/cpaster/splitter.cpp
@@ -33,7 +33,7 @@
 
 #include "splitter.h"
 
-#include <QRegExp>
+#include <QtCore/QRegExp>
 
 FileDataList splitDiffToFiles(const QByteArray &data)
 {
diff --git a/src/shared/cpaster/splitter.h b/src/shared/cpaster/splitter.h
index bb456eb34d6..2d195e5f93b 100644
--- a/src/shared/cpaster/splitter.h
+++ b/src/shared/cpaster/splitter.h
@@ -34,9 +34,9 @@
 #ifndef SPLITTER_H
 #define SPLITTER_H
 
-#include <QByteArray>
-#include <QList>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 struct FileData
 {