concurrent: Fix missing or improper include guard in headers

Use an include guard in headers to ensure the header is not included
more than once. Make the header guard match its file name.

Also, cpp files should include their own headers first (but below config.h)

Change-Id: I902c8936382f5c1a8e0de7dbf49e5423f9b72bbe
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

src/concurrent/qfutureinterface.cpp

@@ -44,13 +44,13 @@
 
 #ifndef QT_NO_QFUTURE
 
+#include "qfutureinterface_p.h"
+
 #include <QtCore/qatomic.h>
 #include <QtCore/qthread.h>
 #include <QtCore/qthreadpool.h>
 #include <private/qthreadpool_p.h>
 
-#include "qfutureinterface_p.h"
-
 QT_BEGIN_NAMESPACE
 
 enum {

src/concurrent/qfuturesynchronizer.h

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFUTRUESYNCHRONIZER_H
-#define QFUTRUESYNCHRONIZER_H
+#ifndef QFUTURESYNCHRONIZER_H
+#define QFUTURESYNCHRONIZER_H
 
 #include <QtConcurrent/qtconcurrent_global.h>
 
@@ -119,4 +119,4 @@ QT_END_HEADER
 
 #endif // QT_NO_CONCURRENT
 
-#endif // QFUTRUESYNCHRONIZER_H
+#endif // QFUTURESYNCHRONIZER_H

src/concurrent/qfuturewatcher.cpp

@@ -43,13 +43,13 @@
 
 #ifndef QT_NO_QFUTURE
 
+#include "qfuturewatcher_p.h"
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qthread.h>
 
-#include "qfuturewatcher_p.h"
-
 QT_BEGIN_NAMESPACE
 
 /*! \class QFutureWatcher