4 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index fe980dd33..db1dc6e50 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -30,7 +30,9 @@
 #include "enums/gui/layouttype.h"
 
 #include "gui/windows/setupwindow.h"
+#ifdef TMWA_SUPPORT
 #include "gui/windows/tradewindow.h"
+#endif  // TMWA_SUPPORT
 
 #include "gui/models/shopitems.h"
 #include "gui/models/sortlistmodelbuy.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 39ceaef64..5a0a02acb 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -45,7 +45,9 @@
 #include "net/character.h"
 #include "net/charserverhandler.h"
 #include "net/logindata.h"
+#ifdef TMWA_SUPPORT
 #include "net/net.h"
+#endif  // TMWA_SUPPORT
 #include "net/serverfeatures.h"
 
 #include "utils/foreach.h"
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 5c8ee1357..88d88af8a 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -28,7 +28,6 @@
 #include "input/keyboardconfig.h"
 
 #include "gui/models/iconsmodel.h"
-#include "gui/models/magicschoolmodel.h"
 #include "gui/models/targettypemodel.h"
 
 #include "gui/widgets/button.h"
@@ -37,7 +36,12 @@
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layoutcell.h"
+
+#ifdef TMWA_SUPPORT
+#include "gui/models/magicschoolmodel.h"
+
 #include "gui/widgets/radiobutton.h"
+#endif  // TMWA_SUPPORT
 
 #include "utils/delete2.h"
 
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index 35d930c4c..e123d3941 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -59,9 +59,9 @@
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
 
+#ifdef TMWA_SUPPORT
 #include "net/net.h"
-
-#ifndef TMWA_SUPPORT
+#else  // TMWA_SUPPORT
 #include <curl/curl.h>
 #endif  // TMWA_SUPPORT