Merge remote-tracking branch 'origin/Applications/17.04'

src/editor/kmcomposerwin.cpp

@@ -188,11 +188,6 @@
 #include <gpgme++/keylistresult.h>
 #include <gpgme++/key.h>
 
-// System includes
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <memory>
 #include <KSplitterCollapserButton>
 #include <Akonadi/Contact/ContactGroupExpandJob>
 #include <editor/potentialphishingemail/potentialphishingemailjob.h>

src/kmcommands.cpp

@@ -112,9 +112,6 @@
 
 #include <gpgme++/error.h>
 
-#include <algorithm>
-#include <memory>
-#include <unistd.h> // link()
 #include <KBookmarkManager>
 
 #include <KDBusServiceStarter>

src/kmkernel.cpp

@@ -102,13 +102,6 @@ using KMail::MailServiceImpl;
 #include <QtDBus/QtDBus>
 #include <QMimeDatabase>
 
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
 #include <MailCommon/ResourceReadConfigFile>
 
 #include <kstartupinfo.h>

src/kmreaderwin.cpp

@@ -80,12 +80,6 @@ using namespace MessageViewer;
 #undef Never
 #undef Always
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
 #include <mailcommon/mailutil.h>
 
 using namespace KMail;