[calamares] [libcalamaresui] Improve includes

- avoid useless ../
 - sort alphabetically and by kind

src/calamares/progresstree/ProgressTreeDelegate.cpp

@@ -19,12 +19,13 @@
 
 #include "ProgressTreeDelegate.h"
 
-#include "../CalamaresApplication.h"
+#include "Branding.h"
-#include "../CalamaresWindow.h"
+#include "CalamaresApplication.h"
-#include "ViewStepItem.h"
+#include "CalamaresWindow.h"
 #include "ProgressTreeModel.h"
 #include "ViewManager.h"
-#include "Branding.h"
+#include "ViewStepItem.h"
+
 #include "utils/CalamaresUtilsGui.h"
 
 #include <QAbstractItemView>

src/libcalamaresui/viewpages/AbstractPage.h

@@ -21,7 +21,7 @@
 
 #include <QWidget>
 
-#include "../UiDllMacro.h"
+#include "UiDllMacro.h"
 
 namespace Calamares
 {

src/libcalamaresui/viewpages/ViewStep.h

@@ -21,10 +21,12 @@
 #define VIEWSTEP_H
 
 #include <QObject>
+#include <QSize>
+
+#include "Typedefs.h"
+#include "UiDllMacro.h"
 
 #include "modulesystem/Requirement.h"
-#include "../UiDllMacro.h"
-#include "Typedefs.h"
 
 namespace Calamares
 {