GUI: Fix Cloud-related dialogs a little

Minor mistakes which lead to build failure in some cases.

gui/downloaddialog.h

@@ -25,7 +25,6 @@
 
 #include "gui/dialog.h"
 #include "common/str.h"
-#include <backends/cloud/storage.h>
 
 namespace GUI {
 class LauncherDialog;

gui/editgamedialog.cpp

@@ -25,6 +25,7 @@
 #include "common/config-manager.h"
 #include "common/gui_options.h"
 #include "common/translation.h"
+#include "common/system.h"
 
 #include "gui/browser.h"
 #include "gui/message.h"

gui/module.mk

@@ -6,7 +6,6 @@ MODULE_OBJS := \
 	console.o \
 	debugger.o \
 	dialog.o \
-	downloaddialog.o \
 	editgamedialog.o \
 	error.o \
 	EventRecorder.o \
@@ -18,10 +17,8 @@ MODULE_OBJS := \
 	object.o \
 	options.o \
 	predictivedialog.o \
-	remotebrowser.o \
 	saveload.o \
 	saveload-dialog.o \
-	storagewizarddialog.o \
 	themebrowser.o \
 	ThemeEngine.o \
 	ThemeEval.o \
@@ -61,6 +58,13 @@ MODULE_OBJS += \
 endif
 endif
 
+ifdef USE_LIBCURL
+MODULE_OBJS += \
+	downloaddialog.o \
+	remotebrowser.o \
+	storagewizarddialog.o
+endif
+
 ifdef ENABLE_EVENTRECORDER
 MODULE_OBJS += \
 	editrecorddialog.o \

gui/options.cpp

@@ -42,11 +42,11 @@
 #include "audio/musicplugin.h"
 #include "audio/mixer.h"
 #include "audio/fmopl.h"
-#include "downloaddialog.h"
 #include "widgets/scrollcontainer.h"
 
 #ifdef USE_LIBCURL
 #include "backends/cloud/cloudmanager.h"
+#include "gui/downloaddialog.h"
 #include "gui/storagewizarddialog.h"
 #endif