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/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -28,19 +28,16 @@
 ****************************************************************************/
 
 #include "cppcodestylesettingspage.h"
+
 #include "cppcodestylepreferences.h"
 #include "cpppointerdeclarationformatter.h"
 #include "cppqtstyleindenter.h"
 #include "cpptoolsconstants.h"
 #include "cpptoolssettings.h"
-#include "ui_cppcodestylesettingspage.h"
-
-#include <Overview.h>
-#include <pp.h>
+#include <ui_cppcodestylesettingspage.h>
 
 #include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <extensionsystem/pluginmanager.h>
 #include <texteditor/codestyleeditor.h>
 #include <texteditor/displaysettings.h>
 #include <texteditor/fontsettings.h>
@@ -48,6 +45,11 @@
 #include <texteditor/tabsettings.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <cplusplus/Overview.h>
+#include <cplusplus/pp.h>
+
+#include <extensionsystem/pluginmanager.h>
+
 #include <QTextBlock>
 #include <QTextStream>