fix include style relating to cplusplus libraries

... and adjust INCLUDEPATH accordingly.

while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.

Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

src/libs/cplusplus/ResolveExpression.cpp

@@ -28,26 +28,28 @@
 ****************************************************************************/
 
 #include "ResolveExpression.h"
+
 #include "LookupContext.h"
 #include "Overview.h"
 #include "DeprecatedGenTemplateInstance.h"
 #include "CppRewriter.h"
 #include "TypeOfExpression.h"
 
-#include <Control.h>
-#include <AST.h>
-#include <Scope.h>
-#include <Names.h>
-#include <Symbols.h>
-#include <Literals.h>
-#include <CoreTypes.h>
-#include <TypeVisitor.h>
-#include <NameVisitor.h>
-#include <Templates.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/Templates.h>
 
 #include <QList>
 #include <QDebug>
 #include <QSet>
+
 #include <map>
 
 using namespace CPlusPlus;