35 files changed, 69 insertions, 68 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 89a9a681f..885f812d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2010,14 +2010,14 @@ manaplustests_CXXFLAGS += -DOPENGLERRORS
 endif
 
 manaplustests_SOURCES = ${SRC} \
-	      test/unittests.h \
-	      enums/render/mockdrawtype.h \
-	      render/mockdrawitem.h \
-	      render/mockgraphics.cc \
-	      render/mockgraphics.h \
-	      enums/enums_unittest.cc \
-	      utils/dumplibs_unittest.cc \
-	      utils/checkutils_unittest.cc
+	      unittests/unittests.h \
+	      unittests/enums/render/mockdrawtype.h \
+	      unittests/render/mockdrawitem.h \
+	      unittests/render/mockgraphics.cc \
+	      unittests/render/mockgraphics.h \
+	      unittests/enums/enums_unittest.cc \
+	      unittests/utils/dumplibs_unittest.cc \
+	      unittests/utils/checkutils_unittest.cc
 
 if ENABLE_UNITTESTS_CATCH
 manaplustests_SOURCES += \
@@ -2034,32 +2034,32 @@ manaplustests_LDFLAGS += -mconsole
 endif
 
 manaplustests_SOURCES += \
-	      fs/virtfs/virtfs1_unittest.cc \
-	      fs/virtfs/zip_unittest.cc \
-	      fs/virtfs/virtfs_unittest.cc \
-	      utils/xml_unittest.cc \
-	      configuration_unittest.cc \
-	      utils/timer_unittest.cc \
-	      utils/xmlutils_unittest.cc \
-	      utils/mathutils_unittest.cc \
-	      fs/files_unittest.cc \
-	      utils/stringutils_unittest.cc \
-	      utils/parameters_unittest.cc \
-	      resources/mstack_unittest.cc \
-	      utils/translation/poparser_unittest.cc \
-	      utils/langs_unittest.cc \
-	      resources/sprite/animatedsprite_unittest.cc \
-	      gui/fonts/textchunklist_unittest.cc \
-	      gui/widgets/browserbox_unittest.cc \
-	      resources/dye/dye_unittest.cc \
-	      resources/dye/dyepalette_unittest.cc \
-	      integrity_unittest.cc \
-	      utils/chatutils_unittest.cc \
-	      resources/map/speciallayer_unittest.cc \
-	      resources/map/maplayer_unittest.cc \
-	      resources/resourcemanager/resourcemanager_unittest.cc \
-	      resources/sdlimagehelper_unittest.cc \
-	      gui/windowmanager_unittest.cc
+	      unittests/fs/virtfs/virtfs1_unittest.cc \
+	      unittests/fs/virtfs/zip_unittest.cc \
+	      unittests/fs/virtfs/virtfs_unittest.cc \
+	      unittests/utils/xml_unittest.cc \
+	      unittests/configuration_unittest.cc \
+	      unittests/utils/timer_unittest.cc \
+	      unittests/utils/xmlutils_unittest.cc \
+	      unittests/utils/mathutils_unittest.cc \
+	      unittests/fs/files_unittest.cc \
+	      unittests/utils/stringutils_unittest.cc \
+	      unittests/utils/parameters_unittest.cc \
+	      unittests/resources/mstack_unittest.cc \
+	      unittests/utils/translation/poparser_unittest.cc \
+	      unittests/utils/langs_unittest.cc \
+	      unittests/resources/sprite/animatedsprite_unittest.cc \
+	      unittests/gui/fonts/textchunklist_unittest.cc \
+	      unittests/gui/widgets/browserbox_unittest.cc \
+	      unittests/resources/dye/dye_unittest.cc \
+	      unittests/resources/dye/dyepalette_unittest.cc \
+	      unittests/integrity_unittest.cc \
+	      unittests/utils/chatutils_unittest.cc \
+	      unittests/resources/map/speciallayer_unittest.cc \
+	      unittests/resources/map/maplayer_unittest.cc \
+	      unittests/resources/resourcemanager/resourcemanager_unittest.cc \
+	      unittests/resources/sdlimagehelper_unittest.cc \
+	      unittests/gui/windowmanager_unittest.cc
 
 if ENABLE_UNITTESTS
 TESTS = manaplustests
diff --git a/src/configuration_unittest.cc b/src/unittests/configuration_unittest.cc
index 7668e668b..58073bbdb 100644
--- a/src/configuration_unittest.cc
+++ b/src/unittests/configuration_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "configuration.h"
 #include "configmanager.h"
diff --git a/src/enums/enums_unittest.cc b/src/unittests/enums/enums_unittest.cc
index 84f2eb642..ebff849d9 100644
--- a/src/enums/enums_unittest.cc
+++ b/src/unittests/enums/enums_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "enums/being/gender.h"
 
diff --git a/src/enums/render/mockdrawtype.h b/src/unittests/enums/render/mockdrawtype.h
index 7477684d0..7477684d0 100644
--- a/src/enums/render/mockdrawtype.h
+++ b/src/unittests/enums/render/mockdrawtype.h
diff --git a/src/fs/files_unittest.cc b/src/unittests/fs/files_unittest.cc
index c658c34af..927891fdd 100644
--- a/src/fs/files_unittest.cc
+++ b/src/unittests/fs/files_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "logger.h"
 
diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/unittests/fs/virtfs/virtfs1_unittest.cc
index 69d40b9b3..687316397 100644
--- a/src/fs/virtfs/virtfs1_unittest.cc
+++ b/src/unittests/fs/virtfs/virtfs1_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "fs/files.h"
 
diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/unittests/fs/virtfs/virtfs_unittest.cc
index f31157f35..c31f0965e 100644
--- a/src/fs/virtfs/virtfs_unittest.cc
+++ b/src/unittests/fs/virtfs/virtfs_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "fs/files.h"
 #include "fs/paths.h"
diff --git a/src/fs/virtfs/zip_unittest.cc b/src/unittests/fs/virtfs/zip_unittest.cc
index 0aa26595f..10b4b52b5 100644
--- a/src/fs/virtfs/zip_unittest.cc
+++ b/src/unittests/fs/virtfs/zip_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "logger.h"
 
diff --git a/src/gui/fonts/textchunklist_unittest.cc b/src/unittests/gui/fonts/textchunklist_unittest.cc
index 1c0330dce..c8df87455 100644
--- a/src/gui/fonts/textchunklist_unittest.cc
+++ b/src/unittests/gui/fonts/textchunklist_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "gui/fonts/font.h"
 #include "gui/fonts/textchunk.h"
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/unittests/gui/widgets/browserbox_unittest.cc
index 6bcc91110..128c7a52c 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/unittests/gui/widgets/browserbox_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/gui/windowmanager_unittest.cc b/src/unittests/gui/windowmanager_unittest.cc
index c5e09911f..75949fc44 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/unittests/gui/windowmanager_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "configmanager.h"
diff --git a/src/integrity_unittest.cc b/src/unittests/integrity_unittest.cc
index 130716ce6..b2c234109 100644
--- a/src/integrity_unittest.cc
+++ b/src/unittests/integrity_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "logger.h"
diff --git a/src/render/mockdrawitem.h b/src/unittests/render/mockdrawitem.h
index eb2793877..75951123e 100644
--- a/src/render/mockdrawitem.h
+++ b/src/unittests/render/mockdrawitem.h
@@ -23,7 +23,7 @@
 
 #ifdef UNITTESTS
 
-#include "enums/render/mockdrawtype.h"
+#include "unittests/enums/render/mockdrawtype.h"
 
 #include "localconsts.h"
 
diff --git a/src/render/mockgraphics.cc b/src/unittests/render/mockgraphics.cc
index d36a6b1f5..b484ad4d1 100644
--- a/src/render/mockgraphics.cc
+++ b/src/unittests/render/mockgraphics.cc
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "render/mockgraphics.h"
+#include "unittests/render/mockgraphics.h"
 
 #include "graphicsmanager.h"
 
diff --git a/src/render/mockgraphics.h b/src/unittests/render/mockgraphics.h
index 3d38f4a51..ccc6d75e6 100644
--- a/src/render/mockgraphics.h
+++ b/src/unittests/render/mockgraphics.h
@@ -26,7 +26,8 @@
 #ifdef UNITTESTS
 
 #include "render/graphics.h"
-#include "render/mockdrawitem.h"
+
+#include "unittests/render/mockdrawitem.h"
 
 #include "localconsts.h"
 
diff --git a/src/resources/dye/dye_unittest.cc b/src/unittests/resources/dye/dye_unittest.cc
index 87ac73fbf..fcdeb7b17 100644
--- a/src/resources/dye/dye_unittest.cc
+++ b/src/unittests/resources/dye/dye_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "graphicsmanager.h"
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/unittests/resources/dye/dyepalette_unittest.cc
index c7d64d918..0e99e9871 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/unittests/resources/dye/dyepalette_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/resources/map/maplayer_unittest.cc b/src/unittests/resources/map/maplayer_unittest.cc
index 194128815..85d8c4f09 100644
--- a/src/resources/map/maplayer_unittest.cc
+++ b/src/unittests/resources/map/maplayer_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "graphicsmanager.h"
 
@@ -31,11 +31,11 @@
 
 #include "gui/theme.h"
 
+#include "unittests/render/mockgraphics.h"
+
 #include "utils/delete2.h"
 #include "utils/env.h"
 
-#include "render/mockgraphics.h"
-
 #include "resources/sdlimagehelper.h"
 
 #include "resources/image/image.h"
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/unittests/resources/map/speciallayer_unittest.cc
index af84d6a77..0461a98c4 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/unittests/resources/map/speciallayer_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "logger.h"
diff --git a/src/resources/mstack_unittest.cc b/src/unittests/resources/mstack_unittest.cc
index c45015680..1d2233803 100644
--- a/src/resources/mstack_unittest.cc
+++ b/src/unittests/resources/mstack_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "gui/cliprect.h"
 
diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/unittests/resources/resourcemanager/resourcemanager_unittest.cc
index 2efbc2ab1..90bc873ab 100644
--- a/src/resources/resourcemanager/resourcemanager_unittest.cc
+++ b/src/unittests/resources/resourcemanager/resourcemanager_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "dirs.h"
diff --git a/src/resources/sdlimagehelper_unittest.cc b/src/unittests/resources/sdlimagehelper_unittest.cc
index 517054b1b..2a3aec45b 100644
--- a/src/resources/sdlimagehelper_unittest.cc
+++ b/src/unittests/resources/sdlimagehelper_unittest.cc
@@ -26,7 +26,7 @@ PRAGMA48(GCC diagnostic ignored "-Wshadow")
 PRAGMA48(GCC diagnostic pop)
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "graphicsmanager.h"
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/unittests/resources/sprite/animatedsprite_unittest.cc
index b04d585fd..3e4a1826c 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/unittests/resources/sprite/animatedsprite_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "configuration.h"
 #include "configmanager.h"
diff --git a/src/test/unittests.h b/src/unittests/unittests.h
index 13be1b9c0..13be1b9c0 100644
--- a/src/test/unittests.h
+++ b/src/unittests/unittests.h
diff --git a/src/utils/chatutils_unittest.cc b/src/unittests/utils/chatutils_unittest.cc
index b63bf87ad..681d91d3e 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/unittests/utils/chatutils_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/utils/checkutils_unittest.cc b/src/unittests/utils/checkutils_unittest.cc
index 644752306..c54dcf9fc 100644
--- a/src/utils/checkutils_unittest.cc
+++ b/src/unittests/utils/checkutils_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
diff --git a/src/utils/dumplibs_unittest.cc b/src/unittests/utils/dumplibs_unittest.cc
index 7c64911e3..35b80c710 100644
--- a/src/utils/dumplibs_unittest.cc
+++ b/src/unittests/utils/dumplibs_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "logger.h"
 
diff --git a/src/utils/langs_unittest.cc b/src/unittests/utils/langs_unittest.cc
index 695644a4b..d9ff6eded 100644
--- a/src/utils/langs_unittest.cc
+++ b/src/unittests/utils/langs_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "configuration.h"
 
diff --git a/src/utils/mathutils_unittest.cc b/src/unittests/utils/mathutils_unittest.cc
index 187accf74..3eb0214ef 100644
--- a/src/utils/mathutils_unittest.cc
+++ b/src/unittests/utils/mathutils_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "utils/mathutils.h"
 
diff --git a/src/utils/parameters_unittest.cc b/src/unittests/utils/parameters_unittest.cc
index 7739b62bd..90d872d5a 100644
--- a/src/utils/parameters_unittest.cc
+++ b/src/unittests/utils/parameters_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "utils/parameters.h"
 
diff --git a/src/utils/stringutils_unittest.cc b/src/unittests/utils/stringutils_unittest.cc
index 354232965..b137ef30d 100644
--- a/src/utils/stringutils_unittest.cc
+++ b/src/unittests/utils/stringutils_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "configuration.h"
 #include "logger.h"
diff --git a/src/utils/timer_unittest.cc b/src/unittests/utils/timer_unittest.cc
index 4a9f245da..b5cfc692e 100644
--- a/src/utils/timer_unittest.cc
+++ b/src/unittests/utils/timer_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "const/utils/timer.h"
 
diff --git a/src/utils/translation/poparser_unittest.cc b/src/unittests/utils/translation/poparser_unittest.cc
index f986c0f37..f724e66fb 100644
--- a/src/utils/translation/poparser_unittest.cc
+++ b/src/unittests/utils/translation/poparser_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/utils/xml_unittest.cc b/src/unittests/utils/xml_unittest.cc
index cd5346954..f9f7990f8 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/unittests/utils/xml_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/utils/xmlutils_unittest.cc b/src/unittests/utils/xmlutils_unittest.cc
index eb6ec15aa..014730e95 100644
--- a/src/utils/xmlutils_unittest.cc
+++ b/src/unittests/utils/xmlutils_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests.h"
+#include "unittests/unittests.h"
 
 #include "client.h"
 #include "graphicsmanager.h"