8 files changed, 24 insertions, 10 deletions
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index 0a43c6e2f..f483a73ca 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -35,7 +35,6 @@
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <algorithm>
 
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 90b966259..02ff66354 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -46,6 +46,7 @@
 #include "resources/db/colordb.h"
 #include "resources/db/itemdb.h"
 
+#include "utils/delete2.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 83041bc75..6cd9ecdf5 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -47,6 +47,7 @@
 #include "net/loginhandler.h"
 #include "net/net.h"
 
+#include "utils/delete2.h"
 #include "utils/paths.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index 0a9a222cd..9d0b72295 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -44,6 +44,7 @@
 
 #include "resources/map/map.h"
 
+#include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/process.h"
 
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index a56c79a3b..48ccd9f6d 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -31,6 +31,7 @@
 
 #include "input/inputaction.h"
 
+#include "net/download.h"
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
@@ -683,7 +684,7 @@ void ServerDialog::saveCustomServers(const ServerInfo &currentServer,
 int ServerDialog::downloadUpdate(void *ptr, DownloadStatus::Type status,
                                  size_t total, size_t remaining)
 {
-    if (!ptr || status == DownloadStatus::CANCELLED)
+    if (!ptr || status == DownloadStatus::Cancelled)
         return -1;
 
     ServerDialog *const sd = reinterpret_cast<ServerDialog*>(ptr);
@@ -692,7 +693,7 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus::Type status,
     if (!sd->mDownload)
         return -1;
 
-    if (status == DownloadStatus::COMPLETE)
+    if (status == DownloadStatus::Complete)
     {
         finished = true;
     }
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index e2ab64ada..f10a222e6 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include "net/download.h"
+#include "net/downloadstatus.h"
 #include "net/serverinfo.h"
 
 #include "utils/mutex.h"
@@ -42,6 +42,11 @@ class Label;
 class ListBox;
 class ServersListModel;
 
+namespace Net
+{
+    class Download;
+}
+
 /**
  * The server choice dialog.
  *
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 898d50425..ff194ada4 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -38,7 +38,8 @@
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "net/logindata.h"
+#include "net/download.h"
+#include "net/updatetype.h"
 
 #include "resources/resourcemanager.h"
 
@@ -463,12 +464,12 @@ int UpdaterWindow::updateProgress(void *ptr, DownloadStatus::Type status,
     if (!uw)
         return -1;
 
-    if (status == DownloadStatus::COMPLETE)
+    if (status == DownloadStatus::Complete)
     {
         uw->mDownloadComplete = true;
     }
-    else if (status == DownloadStatus::ERROR ||
-             status == DownloadStatus::CANCELLED)
+    else if (status == DownloadStatus::Error ||
+             status == DownloadStatus::Cancelled)
     {
         if (uw->mDownloadStatus == UPDATE_COMPLETE)
         {   // ignoring error in last state (was UPDATE_PATCH)
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 332f0d629..eaca25e9f 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -26,8 +26,6 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
-#include "net/download.h"
-
 #include "resources/updatefile.h"
 
 #include "utils/mutex.h"
@@ -35,6 +33,8 @@
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
 
+#include "net/downloadstatus.h"
+
 #include <string>
 #include <vector>
 
@@ -45,6 +45,11 @@ class ProgressBar;
 class ResourceManager;
 class ScrollArea;
 
+namespace Net
+{
+    class Download;
+}
+
 /**
  * Update progress window GUI
  *