Disable using physfs in all builds except cmake.

7 files changed, 301 insertions, 306 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dca0a052..d8f9b7e09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -198,7 +198,7 @@ cpplint:
 gcc-5_h_all:
   stage: prebuild
   script:
-  - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_PHYSFS
+  - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML
   <<: *job-shared
   variables:
     PACKAGES: gcc-5 g++-5 
@@ -209,7 +209,7 @@ gcc-5_h_all:
 gcc-5_h_all_i386:
   stage: prebuild
   script:
-  - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_PHYSFS
+  - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML
   image: vicamo/debian:sid-i386
   <<: *job-shared
   variables:
@@ -1410,7 +1410,7 @@ gcc-4.9_sdl2:
 gcc-5_h_eathena_tmwa:
   stage: build
   script:
-  - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_PHYSFS
+  - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML
   <<: *job-shared
   variables:
     PACKAGES: gcc-5 g++-5 
@@ -2075,7 +2075,7 @@ gcc-6_SDL_default_test:
 deheader_gui_windows_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2085,7 +2085,7 @@ deheader_gui_windows_cpp:
 deheader_sdl2_gui_windows_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2095,7 +2095,7 @@ deheader_sdl2_gui_windows_cpp:
 deheader_gui_windows_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2105,7 +2105,7 @@ deheader_gui_windows_withoutopengl_cpp:
 deheader_sdl2_gui_windows_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2115,7 +2115,7 @@ deheader_sdl2_gui_windows_withoutopengl_cpp:
 deheader_gui_widgets_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2125,7 +2125,7 @@ deheader_gui_widgets_cpp:
 deheader_sdl2_gui_widgets_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2135,7 +2135,7 @@ deheader_sdl2_gui_widgets_cpp:
 deheader_gui_widgets_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2145,7 +2145,7 @@ deheader_gui_widgets_withoutopengl_cpp:
 deheader_sdl2_gui_widgets_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2155,7 +2155,7 @@ deheader_sdl2_gui_widgets_withoutopengl_cpp:
 deheader_gui_models_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2165,7 +2165,7 @@ deheader_gui_models_cpp:
 deheader_sdl2_gui_models_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2175,7 +2175,7 @@ deheader_sdl2_gui_models_cpp:
 deheader_gui_models_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2185,7 +2185,7 @@ deheader_gui_models_withoutopengl_cpp:
 deheader_sdl2_gui_models_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2195,7 +2195,7 @@ deheader_sdl2_gui_models_withoutopengl_cpp:
 deheader_actions_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2205,7 +2205,7 @@ deheader_actions_cpp:
 deheader_actions_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2215,7 +2215,7 @@ deheader_actions_h:
 deheader_being_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2225,7 +2225,7 @@ deheader_being_cpp:
 deheader_being_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2235,7 +2235,7 @@ deheader_being_h:
 deheader_const_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/const -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2245,7 +2245,7 @@ deheader_const_h:
 deheader_dyecmd_cpp:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2255,7 +2255,7 @@ deheader_dyecmd_cpp:
 deheader_dyecmd_h:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2265,7 +2265,7 @@ deheader_dyecmd_h:
 deheader_enums_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/enums -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2275,7 +2275,7 @@ deheader_enums_h:
 deheader_events_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/events -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2285,7 +2285,7 @@ deheader_events_h:
 deheader_gui_fonts_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2295,7 +2295,7 @@ deheader_gui_fonts_cpp:
 deheader_gui_fonts_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2305,7 +2305,7 @@ deheader_gui_fonts_h:
 deheader_gui_models_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2315,7 +2315,7 @@ deheader_gui_models_h:
 deheader_gui_popups_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2325,7 +2325,7 @@ deheader_gui_popups_cpp:
 deheader_gui_popups_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2335,7 +2335,7 @@ deheader_gui_popups_h:
 deheader_gui_shortcut_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2345,7 +2345,7 @@ deheader_gui_shortcut_cpp:
 deheader_gui_shortcut_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2355,7 +2355,7 @@ deheader_gui_shortcut_h:
 deheader_gui_widgets_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2365,7 +2365,7 @@ deheader_gui_widgets_h:
 deheader_gui_windows_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2375,7 +2375,7 @@ deheader_gui_windows_h:
 deheader_gui_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.cpp" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2385,7 +2385,7 @@ deheader_gui_cpp:
 deheader_gui_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.h" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2395,7 +2395,7 @@ deheader_gui_h:
 deheader_input_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2405,7 +2405,7 @@ deheader_input_cpp:
 deheader_input_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2415,7 +2415,7 @@ deheader_input_h:
 deheader_listeners_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2425,7 +2425,7 @@ deheader_listeners_cpp:
 deheader_listeners_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2435,7 +2435,7 @@ deheader_listeners_h:
 deheader_net_ea_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2445,7 +2445,7 @@ deheader_net_ea_cpp:
 deheader_net_ea_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2455,7 +2455,7 @@ deheader_net_ea_h:
 deheader_net_eathena_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2465,7 +2465,7 @@ deheader_net_eathena_cpp:
 deheader_net_eathena_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2475,7 +2475,7 @@ deheader_net_eathena_h:
 deheader_net_tmwa_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2485,7 +2485,7 @@ deheader_net_tmwa_cpp:
 deheader_net_tmwa_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2495,7 +2495,7 @@ deheader_net_tmwa_h:
 deheader_net_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.cpp" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2505,7 +2505,7 @@ deheader_net_cpp:
 deheader_net_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.h" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2515,7 +2515,7 @@ deheader_net_h:
 deheader_particle_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2525,7 +2525,7 @@ deheader_particle_cpp:
 deheader_particle_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2535,7 +2535,7 @@ deheader_particle_h:
 deheader_render_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2545,7 +2545,7 @@ deheader_render_cpp:
 deheader_render_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2555,7 +2555,7 @@ deheader_render_h:
 deheader_resources_db_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2565,7 +2565,7 @@ deheader_resources_db_cpp:
 deheader_resources_db_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2575,7 +2575,7 @@ deheader_resources_db_h:
 deheader_resources_map_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2585,7 +2585,7 @@ deheader_resources_map_cpp:
 deheader_resources_map_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2595,7 +2595,7 @@ deheader_resources_map_h:
 deheader_resources_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.cpp" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2605,7 +2605,7 @@ deheader_resources_cpp:
 deheader_resources_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.h" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2615,7 +2615,7 @@ deheader_resources_h:
 deheader_test_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2625,7 +2625,7 @@ deheader_test_cpp:
 deheader_test_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2635,7 +2635,7 @@ deheader_test_h:
 deheader_utils_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2645,7 +2645,7 @@ deheader_utils_cpp:
 deheader_utils_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2655,7 +2655,7 @@ deheader_utils_h:
 deheader_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cpp" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2665,7 +2665,7 @@ deheader_cpp:
 deheader_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.h" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2675,7 +2675,7 @@ deheader_h:
 deheader_cc:
   stage: build
   script:
-  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2687,7 +2687,7 @@ deheader_cc:
 deheader_sdl2_actions_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2697,7 +2697,7 @@ deheader_sdl2_actions_cpp:
 deheader_sdl2_actions_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2707,7 +2707,7 @@ deheader_sdl2_actions_h:
 deheader_sdl2_being_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2717,7 +2717,7 @@ deheader_sdl2_being_cpp:
 deheader_sdl2_being_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2727,7 +2727,7 @@ deheader_sdl2_being_h:
 deheader_sdl2_const_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/const -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2737,7 +2737,7 @@ deheader_sdl2_const_h:
 deheader_sdl2_dyecmd_cpp:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2747,7 +2747,7 @@ deheader_sdl2_dyecmd_cpp:
 deheader_sdl2_dyecmd_h:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2757,7 +2757,7 @@ deheader_sdl2_dyecmd_h:
 deheader_sdl2_enums_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/enums -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2767,7 +2767,7 @@ deheader_sdl2_enums_h:
 deheader_sdl2_events_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/events -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2777,7 +2777,7 @@ deheader_sdl2_events_h:
 deheader_sdl2_gui_fonts_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2787,7 +2787,7 @@ deheader_sdl2_gui_fonts_cpp:
 deheader_sdl2_gui_fonts_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2797,7 +2797,7 @@ deheader_sdl2_gui_fonts_h:
 deheader_sdl2_gui_models_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2807,7 +2807,7 @@ deheader_sdl2_gui_models_h:
 deheader_sdl2_gui_popups_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2817,7 +2817,7 @@ deheader_sdl2_gui_popups_cpp:
 deheader_sdl2_gui_popups_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2827,7 +2827,7 @@ deheader_sdl2_gui_popups_h:
 deheader_sdl2_gui_shortcut_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2837,7 +2837,7 @@ deheader_sdl2_gui_shortcut_cpp:
 deheader_sdl2_gui_shortcut_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2847,7 +2847,7 @@ deheader_sdl2_gui_shortcut_h:
 deheader_sdl2_gui_widgets_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2857,7 +2857,7 @@ deheader_sdl2_gui_widgets_h:
 deheader_sdl2_gui_windows_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2867,7 +2867,7 @@ deheader_sdl2_gui_windows_h:
 deheader_sdl2_gui_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.cpp" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2877,7 +2877,7 @@ deheader_sdl2_gui_cpp:
 deheader_sdl2_gui_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.h" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2887,7 +2887,7 @@ deheader_sdl2_gui_h:
 deheader_sdl2_input_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2897,7 +2897,7 @@ deheader_sdl2_input_cpp:
 deheader_sdl2_input_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2907,7 +2907,7 @@ deheader_sdl2_input_h:
 deheader_sdl2_listeners_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2917,7 +2917,7 @@ deheader_sdl2_listeners_cpp:
 deheader_sdl2_listeners_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2927,7 +2927,7 @@ deheader_sdl2_listeners_h:
 deheader_sdl2_net_ea_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2937,7 +2937,7 @@ deheader_sdl2_net_ea_cpp:
 deheader_sdl2_net_ea_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2947,7 +2947,7 @@ deheader_sdl2_net_ea_h:
 deheader_sdl2_net_eathena_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2957,7 +2957,7 @@ deheader_sdl2_net_eathena_cpp:
 deheader_sdl2_net_eathena_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2967,7 +2967,7 @@ deheader_sdl2_net_eathena_h:
 deheader_sdl2_net_tmwa_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2977,7 +2977,7 @@ deheader_sdl2_net_tmwa_cpp:
 deheader_sdl2_net_tmwa_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2987,7 +2987,7 @@ deheader_sdl2_net_tmwa_h:
 deheader_sdl2_net_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.cpp" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -2997,7 +2997,7 @@ deheader_sdl2_net_cpp:
 deheader_sdl2_net_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.h" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3007,7 +3007,7 @@ deheader_sdl2_net_h:
 deheader_sdl2_particle_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3017,7 +3017,7 @@ deheader_sdl2_particle_cpp:
 deheader_sdl2_particle_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3027,7 +3027,7 @@ deheader_sdl2_particle_h:
 deheader_sdl2_render_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3037,7 +3037,7 @@ deheader_sdl2_render_cpp:
 deheader_sdl2_render_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3047,7 +3047,7 @@ deheader_sdl2_render_h:
 deheader_sdl2_resources_db_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3057,7 +3057,7 @@ deheader_sdl2_resources_db_cpp:
 deheader_sdl2_resources_db_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3067,7 +3067,7 @@ deheader_sdl2_resources_db_h:
 deheader_sdl2_resources_map_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3077,7 +3077,7 @@ deheader_sdl2_resources_map_cpp:
 deheader_sdl2_resources_map_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3087,7 +3087,7 @@ deheader_sdl2_resources_map_h:
 deheader_sdl2_resources_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.cpp" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3097,7 +3097,7 @@ deheader_sdl2_resources_cpp:
 deheader_sdl2_resources_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.h" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3107,7 +3107,7 @@ deheader_sdl2_resources_h:
 deheader_sdl2_test_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3117,7 +3117,7 @@ deheader_sdl2_test_cpp:
 deheader_sdl2_test_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3127,7 +3127,7 @@ deheader_sdl2_test_h:
 deheader_sdl2_utils_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3137,7 +3137,7 @@ deheader_sdl2_utils_cpp:
 deheader_sdl2_utils_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3147,7 +3147,7 @@ deheader_sdl2_utils_h:
 deheader_sdl2_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cpp" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3157,7 +3157,7 @@ deheader_sdl2_cpp:
 deheader_sdl2_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.h" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3167,7 +3167,7 @@ deheader_sdl2_h:
 deheader_sdl2_cc:
   stage: build
   script:
-  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3179,7 +3179,7 @@ deheader_sdl2_cc:
 deheader_actions_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3189,7 +3189,7 @@ deheader_actions_withoutopengl_cpp:
 deheader_actions_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3199,7 +3199,7 @@ deheader_actions_withoutopengl_h:
 deheader_being_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3209,7 +3209,7 @@ deheader_being_withoutopengl_cpp:
 deheader_being_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3219,7 +3219,7 @@ deheader_being_withoutopengl_h:
 deheader_const_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/const -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3229,7 +3229,7 @@ deheader_const_withoutopengl_h:
 deheader_dyecmd_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3239,7 +3239,7 @@ deheader_dyecmd_withoutopengl_cpp:
 deheader_dyecmd_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3249,7 +3249,7 @@ deheader_dyecmd_withoutopengl_h:
 deheader_enums_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/enums -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3259,7 +3259,7 @@ deheader_enums_withoutopengl_h:
 deheader_events_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/events -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3269,7 +3269,7 @@ deheader_events_withoutopengl_h:
 deheader_gui_fonts_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3279,7 +3279,7 @@ deheader_gui_fonts_withoutopengl_cpp:
 deheader_gui_fonts_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3289,7 +3289,7 @@ deheader_gui_fonts_withoutopengl_h:
 deheader_gui_models_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3299,7 +3299,7 @@ deheader_gui_models_withoutopengl_h:
 deheader_gui_popups_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3309,7 +3309,7 @@ deheader_gui_popups_withoutopengl_cpp:
 deheader_gui_popups_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3319,7 +3319,7 @@ deheader_gui_popups_withoutopengl_h:
 deheader_gui_shortcut_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3329,7 +3329,7 @@ deheader_gui_shortcut_withoutopengl_cpp:
 deheader_gui_shortcut_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3339,7 +3339,7 @@ deheader_gui_shortcut_withoutopengl_h:
 deheader_gui_widgets_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3349,7 +3349,7 @@ deheader_gui_widgets_withoutopengl_h:
 deheader_gui_windows_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3359,7 +3359,7 @@ deheader_gui_windows_withoutopengl_h:
 deheader_gui_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.cpp" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3369,7 +3369,7 @@ deheader_gui_withoutopengl_cpp:
 deheader_gui_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.h" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3379,7 +3379,7 @@ deheader_gui_withoutopengl_h:
 deheader_input_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3389,7 +3389,7 @@ deheader_input_withoutopengl_cpp:
 deheader_input_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3399,7 +3399,7 @@ deheader_input_withoutopengl_h:
 deheader_listeners_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3409,7 +3409,7 @@ deheader_listeners_withoutopengl_cpp:
 deheader_listeners_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3419,7 +3419,7 @@ deheader_listeners_withoutopengl_h:
 deheader_net_ea_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3429,7 +3429,7 @@ deheader_net_ea_withoutopengl_cpp:
 deheader_net_ea_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3439,7 +3439,7 @@ deheader_net_ea_withoutopengl_h:
 deheader_net_eathena_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3449,7 +3449,7 @@ deheader_net_eathena_withoutopengl_cpp:
 deheader_net_eathena_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3459,7 +3459,7 @@ deheader_net_eathena_withoutopengl_h:
 deheader_net_tmwa_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3469,7 +3469,7 @@ deheader_net_tmwa_withoutopengl_cpp:
 deheader_net_tmwa_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3479,7 +3479,7 @@ deheader_net_tmwa_withoutopengl_h:
 deheader_net_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.cpp" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3489,7 +3489,7 @@ deheader_net_withoutopengl_cpp:
 deheader_net_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.h" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3499,7 +3499,7 @@ deheader_net_withoutopengl_h:
 deheader_particle_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3509,7 +3509,7 @@ deheader_particle_withoutopengl_cpp:
 deheader_particle_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3519,7 +3519,7 @@ deheader_particle_withoutopengl_h:
 deheader_render_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3529,7 +3529,7 @@ deheader_render_withoutopengl_cpp:
 deheader_render_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3539,7 +3539,7 @@ deheader_render_withoutopengl_h:
 deheader_resources_db_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3549,7 +3549,7 @@ deheader_resources_db_withoutopengl_cpp:
 deheader_resources_db_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3559,7 +3559,7 @@ deheader_resources_db_withoutopengl_h:
 deheader_resources_map_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3569,7 +3569,7 @@ deheader_resources_map_withoutopengl_cpp:
 deheader_resources_map_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3579,7 +3579,7 @@ deheader_resources_map_withoutopengl_h:
 deheader_resources_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.cpp" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3589,7 +3589,7 @@ deheader_resources_withoutopengl_cpp:
 deheader_resources_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.h" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3599,7 +3599,7 @@ deheader_resources_withoutopengl_h:
 deheader_test_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3609,7 +3609,7 @@ deheader_test_withoutopengl_cpp:
 deheader_test_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3619,7 +3619,7 @@ deheader_test_withoutopengl_h:
 deheader_utils_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3629,7 +3629,7 @@ deheader_utils_withoutopengl_cpp:
 deheader_utils_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3639,7 +3639,7 @@ deheader_utils_withoutopengl_h:
 deheader_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cpp" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3649,7 +3649,7 @@ deheader_withoutopengl_cpp:
 deheader_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.h" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3659,7 +3659,7 @@ deheader_withoutopengl_h:
 deheader_withoutopengl_cc:
   stage: build
   script:
-  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_PHYSFS"
+  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3671,7 +3671,7 @@ deheader_withoutopengl_cc:
 deheader_sdl2_actions_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3681,7 +3681,7 @@ deheader_sdl2_actions_withoutopengl_cpp:
 deheader_sdl2_actions_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/actions -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3691,7 +3691,7 @@ deheader_sdl2_actions_withoutopengl_h:
 deheader_sdl2_being_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3701,7 +3701,7 @@ deheader_sdl2_being_withoutopengl_cpp:
 deheader_sdl2_being_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/being -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3711,7 +3711,7 @@ deheader_sdl2_being_withoutopengl_h:
 deheader_sdl2_const_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/const -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3721,7 +3721,7 @@ deheader_sdl2_const_withoutopengl_h:
 deheader_sdl2_dyecmd_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3731,7 +3731,7 @@ deheader_sdl2_dyecmd_withoutopengl_cpp:
 deheader_sdl2_dyecmd_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/dyetool -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3741,7 +3741,7 @@ deheader_sdl2_dyecmd_withoutopengl_h:
 deheader_sdl2_enums_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/enums -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3751,7 +3751,7 @@ deheader_sdl2_enums_withoutopengl_h:
 deheader_sdl2_events_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/events -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3761,7 +3761,7 @@ deheader_sdl2_events_withoutopengl_h:
 deheader_sdl2_gui_fonts_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3771,7 +3771,7 @@ deheader_sdl2_gui_fonts_withoutopengl_cpp:
 deheader_sdl2_gui_fonts_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/fonts -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3781,7 +3781,7 @@ deheader_sdl2_gui_fonts_withoutopengl_h:
 deheader_sdl2_gui_models_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/models -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3791,7 +3791,7 @@ deheader_sdl2_gui_models_withoutopengl_h:
 deheader_sdl2_gui_popups_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3801,7 +3801,7 @@ deheader_sdl2_gui_popups_withoutopengl_cpp:
 deheader_sdl2_gui_popups_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/popups -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3811,7 +3811,7 @@ deheader_sdl2_gui_popups_withoutopengl_h:
 deheader_sdl2_gui_shortcut_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3821,7 +3821,7 @@ deheader_sdl2_gui_shortcut_withoutopengl_cpp:
 deheader_sdl2_gui_shortcut_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/shortcut -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3831,7 +3831,7 @@ deheader_sdl2_gui_shortcut_withoutopengl_h:
 deheader_sdl2_gui_widgets_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/widgets -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3841,7 +3841,7 @@ deheader_sdl2_gui_widgets_withoutopengl_h:
 deheader_sdl2_gui_windows_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui/windows -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3851,7 +3851,7 @@ deheader_sdl2_gui_windows_withoutopengl_h:
 deheader_sdl2_gui_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.cpp" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3861,7 +3861,7 @@ deheader_sdl2_gui_withoutopengl_cpp:
 deheader_sdl2_gui_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/gui -type f -name "*.h" ! -path "./src/gui/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3871,7 +3871,7 @@ deheader_sdl2_gui_withoutopengl_h:
 deheader_sdl2_input_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3881,7 +3881,7 @@ deheader_sdl2_input_withoutopengl_cpp:
 deheader_sdl2_input_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/input -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3891,7 +3891,7 @@ deheader_sdl2_input_withoutopengl_h:
 deheader_sdl2_listeners_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3901,7 +3901,7 @@ deheader_sdl2_listeners_withoutopengl_cpp:
 deheader_sdl2_listeners_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/listeners -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3911,7 +3911,7 @@ deheader_sdl2_listeners_withoutopengl_h:
 deheader_sdl2_net_ea_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3921,7 +3921,7 @@ deheader_sdl2_net_ea_withoutopengl_cpp:
 deheader_sdl2_net_ea_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/ea -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3931,7 +3931,7 @@ deheader_sdl2_net_ea_withoutopengl_h:
 deheader_sdl2_net_eathena_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3941,7 +3941,7 @@ deheader_sdl2_net_eathena_withoutopengl_cpp:
 deheader_sdl2_net_eathena_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/eathena -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3951,7 +3951,7 @@ deheader_sdl2_net_eathena_withoutopengl_h:
 deheader_sdl2_net_tmwa_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3961,7 +3961,7 @@ deheader_sdl2_net_tmwa_withoutopengl_cpp:
 deheader_sdl2_net_tmwa_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net/tmwa -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3971,7 +3971,7 @@ deheader_sdl2_net_tmwa_withoutopengl_h:
 deheader_sdl2_net_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.cpp" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3981,7 +3981,7 @@ deheader_sdl2_net_withoutopengl_cpp:
 deheader_sdl2_net_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/net -type f -name "*.h" ! -path "./src/net/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -3991,7 +3991,7 @@ deheader_sdl2_net_withoutopengl_h:
 deheader_sdl2_particle_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4001,7 +4001,7 @@ deheader_sdl2_particle_withoutopengl_cpp:
 deheader_sdl2_particle_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/particle -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4011,7 +4011,7 @@ deheader_sdl2_particle_withoutopengl_h:
 deheader_sdl2_render_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4021,7 +4021,7 @@ deheader_sdl2_render_withoutopengl_cpp:
 deheader_sdl2_render_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/render -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4031,7 +4031,7 @@ deheader_sdl2_render_withoutopengl_h:
 deheader_sdl2_resources_db_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4041,7 +4041,7 @@ deheader_sdl2_resources_db_withoutopengl_cpp:
 deheader_sdl2_resources_db_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/db -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4051,7 +4051,7 @@ deheader_sdl2_resources_db_withoutopengl_h:
 deheader_sdl2_resources_map_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4061,7 +4061,7 @@ deheader_sdl2_resources_map_withoutopengl_cpp:
 deheader_sdl2_resources_map_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources/map -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4071,7 +4071,7 @@ deheader_sdl2_resources_map_withoutopengl_h:
 deheader_sdl2_resources_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.cpp" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4081,7 +4081,7 @@ deheader_sdl2_resources_withoutopengl_cpp:
 deheader_sdl2_resources_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/resources -type f -name "*.h" ! -path "./src/resources/db/*" ! -path "./src/resources/map/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4091,7 +4091,7 @@ deheader_sdl2_resources_withoutopengl_h:
 deheader_sdl2_test_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4101,7 +4101,7 @@ deheader_sdl2_test_withoutopengl_cpp:
 deheader_sdl2_test_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/test -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4111,7 +4111,7 @@ deheader_sdl2_test_withoutopengl_h:
 deheader_sdl2_utils_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.cpp" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4121,7 +4121,7 @@ deheader_sdl2_utils_withoutopengl_cpp:
 deheader_sdl2_utils_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src/utils -type f -name "*.h" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4131,7 +4131,7 @@ deheader_sdl2_utils_withoutopengl_h:
 deheader_sdl2_withoutopengl_cpp:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cpp" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4141,7 +4141,7 @@ deheader_sdl2_withoutopengl_cpp:
 deheader_sdl2_withoutopengl_h:
   stage: build
   script:
-  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.h" ! -path "./src/*/*" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
@@ -4151,7 +4151,7 @@ deheader_sdl2_withoutopengl_h:
 deheader_sdl2_withoutopengl_cc:
   stage: build
   script:
-  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_PHYSFS"
+  - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
   - ./tools/ci/jobs/deheader.sh
   - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \;
   - ./tools/ci/jobs/deheader2.sh
diff --git a/Android.mk b/Android.mk
index aa6477a0f..81f3ab687 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,16 +12,15 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include \
     $(ROOT_PATH)/xml2/include \
     $(ROOT_PATH)/gettext-0.18/gettext-runtime/intl \
     $(ROOT_PATH)/sdl_gfx \
-    $(ROOT_PATH)/physfs/include \
     $(ROOT_PATH)/curl/include \
     $(ROOT_PATH)/SDL2_net-2.0.0
 
-LOCAL_CPPFLAGS += -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DENABLE_NLS -DENABLE_LIBXML -DUSE_PHYSFS
+LOCAL_CPPFLAGS += -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DENABLE_NLS -DENABLE_LIBXML
 LOCAL_CPPFLAGS += -frtti -fexceptions -Wno-error=format-security -fvisibility=hidden
 LOCAL_CPPFLAGS += -ffast-math -funswitch-loops -pedantic -Wall -Wc++11-compat -std=c++0x -funsafe-loop-optimizations -flto -fwhole-program
 LOCAL_CPPFLAGS += -fpic -fpie
 
-LOCAL_SHARED_LIBRARIES := SDL2 SDL2_mixer sdl_net SDL2_ttf SDL2_image libcurl intl png physfs sdl2_gfx xml2
+LOCAL_SHARED_LIBRARIES := SDL2 SDL2_mixer sdl_net SDL2_ttf SDL2_image libcurl intl png sdl2_gfx xml2
 
 LOCAL_LDLIBS := -lGLESv1_CM -lEGL -llog -lz
 
diff --git a/build/testfile.sh b/build/testfile.sh
index fe98e9c57..f670bb680 100755
--- a/build/testfile.sh
+++ b/build/testfile.sh
@@ -34,36 +34,36 @@ function run {
 
 echo >${LOGFILE}
 
-run "-DENABLE_LIBXML -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DENABLE_NLS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_LIBXML" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1"
 
-run "-DENABLE_PUGIXML -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DENABLE_NLS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_PUGIXML" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1"
 
 export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2"
 
-run "-DENABLE_LIBXML -DUSE_SDL2 -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DENABLE_NLS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1"
 
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DENABLE_NLS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1"
diff --git a/build/testfiledye.sh b/build/testfiledye.sh
index cb8332a72..ac2ccd777 100755
--- a/build/testfiledye.sh
+++ b/build/testfiledye.sh
@@ -34,36 +34,36 @@ function run {
 
 echo >${LOGFILE}
 
-run "-DENABLE_LIBXML -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DENABLE_NLS -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_LIBXML -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_X11 -DDYECMD" "$includes" "$1"
 
-run "-DENABLE_PUGIXML -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DENABLE_NLS -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_X11 -DDYECMD" "$includes" "$1"
 
 export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2"
 
-run "-DENABLE_LIBXML -DUSE_SDL2 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DENABLE_NLS -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DDYECMD" "$includes" "$1"
 
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DENABLE_NLS -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DDYECMD -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DDYECMD" "$includes" "$1"
diff --git a/build/testfiletest.sh b/build/testfiletest.sh
index a87cfe76d..3708275fd 100755
--- a/build/testfiletest.sh
+++ b/build/testfiletest.sh
@@ -34,36 +34,36 @@ function run {
 
 echo >${LOGFILE}
 
-run "-DENABLE_LIBXML -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DENABLE_NLS -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS" "$includes" "$1"
 
-run "-DENABLE_PUGIXML -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DENABLE_NLS -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS" "$includes" "$1"
 
 export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2"
 
-run "-DENABLE_LIBXML -DUSE_SDL2 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS" "$includes" "$1"
 
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS -DUSE_PHYSFS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS" "$includes" "$1"
diff --git a/configure.ac b/configure.ac
index 67fcdefe3..8e895487b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -261,15 +261,15 @@ AC_CHECK_LIB([z], [inflate], ,
 AC_MSG_ERROR([ *** Unable to find zlib (http://www.gzip.org/zlib/)]))
 
 # Option to enable physfs.
-AC_ARG_WITH(physfs,[  --without-physfs        don't use physfs (experimental) ] )
-if test "x$with_physfs" == "xno"; then
-    with_physfs=no
-else
+AC_ARG_WITH(physfs,[  --with-physfs        use physfs (experimental) ] )
+if test "x$with_physfs" == "xyes"; then
     with_physfs=yes
     AC_CHECK_LIB([physfs], [PHYSFS_init], ,
     AC_MSG_ERROR([ *** Unable to find PhysFS library (http://icculus.org/physfs/)]))
     AC_CHECK_HEADERS([physfs.h], ,
     AC_MSG_ERROR([ *** PhysFS library found but cannot find headers (http://icculus.org/physfs/)]))
+else
+    with_physfs=no
 fi
 AM_CONDITIONAL(USE_PHYSFS, test x$with_physfs = xyes)
 
diff --git a/manaplus.cbp b/manaplus.cbp
index 913867a84..216da898c 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -20,7 +20,6 @@
 					<Add option="-DUSE_MUMBLE" />
 					<Add option="-DTMWA_SUPPORT" />
 					<Add option="-DENABLE_LIBXML" />
-					<Add option="-DUSE_PHYSFS" />
 					<Add directory="src/" />
 					<Add directory="include" />
 					<Add directory="../winlibs/include/libxml2" />
@@ -42,7 +41,6 @@
 					<Add library="opengl32" />
 					<Add library="png15.dll" />
 					<Add library="z.dll" />
-					<Add library="physfs" />
 					<Add library="curl.dll" />
 					<Add library="intl" />
 					<Add library="ws2_32" />
@@ -62,13 +60,11 @@
 					<Add option="`sdl-config --cflags`" />
 					<Add option="-DMANASERV_SUPPORT" />
 					<Add option="-DUSE_OPENGL" />
-					<Add option="-DUSE_PHYSFS" />
 					<Add directory="/usr/include/libxml2" />
 				</Compiler>
 				<Linker>
 					<Add option="`sdl-config --libs`" />
 					<Add library="GL" />
-					<Add library="physfs" />
 					<Add library="curl" />
 					<Add library="xml2" />
 					<Add library="SDL_mixer" />