diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1309daa4e..545a0e6f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,30 +285,27 @@ else()
         unset(CMAKE_HAVE_PTHREAD_H CACHE)
     endif()
 
-    if(NOT APPLE AND DFHACK_BUILD_32)
-        set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
-    endif()
+    # Move zlib to the build folder so possible 32 and 64-bit builds
+    # in the same source tree don't conflict
+    file(COPY ${dfhack_SOURCE_DIR}/depends/zlib
+        DESTINATION ${CMAKE_BINARY_DIR}/depends/)
+    file(COPY ${ZLIB_DOWNLOAD_DIR}/zlib.lib
+        DESTINATION ${CMAKE_BINARY_DIR}/depends/zlib/lib/)
 endif()
-find_package(ZLIB REQUIRED)
-include_directories(${ZLIB_INCLUDE_DIRS})
 
-if(WIN32)
-    # Do the same for SDL.dll
-    # (DFHack doesn't require this at build time, so no need to move it to the build folder)
-    # TODO: remove SDL.dll from our distribution once DF moves to SDL2. we only
-    # continue to include it so we don't break Steam players on update by removing
-    # the SDL.dll that DF needs.
-    set(SDL_DOWNLOAD_DIR ${dfhack_SOURCE_DIR}/package/windows/win${DFHACK_BUILD_ARCH})
-    if(${DFHACK_BUILD_ARCH} STREQUAL "64")
-        download_file("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win64-SDL.dll"
-            ${SDL_DOWNLOAD_DIR}/SDL.dll
-            "1ae242c4b94cb03756a1288122a66faf")
-    else()
-        download_file("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win32-SDL.dll"
-            ${SDL_DOWNLOAD_DIR}/SDL.dll
-            "5a09604daca6b2b5ce049d79af935d6a")
-    endif()
-endif()
+# Download SDL release and extract into depends (in the build dir so as not to clutter up the source dir)
+# all we need are the header files, so the same release package will work for all platforms
+# (the above statement is untested for OSX)
+set(SDL_VERSION 2.26.2)
+set(SDL_ZIP_FILE SDL2-devel-${SDL_VERSION}-VC.zip)
+set(SDL_ZIP_PATH ${CMAKE_BINARY_DIR}/depends/SDL2/)
+file(DOWNLOAD "https://github.com/libsdl-org/SDL/releases/download/release-${SDL_VERSION}/${SDL_ZIP_FILE}"
+    ${SDL_ZIP_PATH}${SDL_ZIP_FILE}
+    EXPECTED_MD5 574daf26d48de753d0b1e19823c9d8bb
+    SHOW_PROGRESS)
+file(ARCHIVE_EXTRACT INPUT ${SDL_ZIP_PATH}${SDL_ZIP_FILE}
+    DESTINATION ${SDL_ZIP_PATH})
+include_directories(${SDL_ZIP_PATH}/SDL2-${SDL_VERSION}/include)
 
 if(APPLE)
     # libstdc++ (GCC 4.8.5 for OS X 10.6)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 8681c9c90..5d2698bb0 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -431,10 +431,6 @@ if(UNIX)
     install(TARGETS dfhooks
         LIBRARY DESTINATION .
         RUNTIME DESTINATION .)
-else()
-    # On windows, copy SDL.dll so DF can still run.
-    install(PROGRAMS ${dfhack_SOURCE_DIR}/package/windows/win${DFHACK_BUILD_ARCH}/SDL.dll
-        DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 endif()
 
 # install the main lib
diff --git a/library/Core.cpp b/library/Core.cpp
index 431cd2c9f..6fc453060 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -84,7 +84,7 @@ using namespace DFHack;
 #include <condition_variable>
 #include "md5wrapper.h"
 
-#include "SDL_events.h"
+#include <SDL_events.h>
 
 #ifdef LINUX_BUILD
 #include <dlfcn.h>
@@ -2347,99 +2347,47 @@ bool Core::DFH_ncurses_key(int key)
     return ncurses_wgetch(key, dummy);
 }
 
-int UnicodeAwareSym(const SDL::KeyboardEvent& ke)
-{
-    // Assume keyboard layouts don't change the order of numbers:
-    if( '0' <= ke.ksym.sym && ke.ksym.sym <= '9') return ke.ksym.sym;
-    if(SDL::K_F1 <= ke.ksym.sym && ke.ksym.sym <= SDL::K_F12) return ke.ksym.sym;
-
-    // These keys are mapped to the same control codes as Ctrl-?
-    switch (ke.ksym.sym)
-    {
-        case SDL::K_RETURN:
-        case SDL::K_KP_ENTER:
-        case SDL::K_TAB:
-        case SDL::K_ESCAPE:
-        case SDL::K_DELETE:
-            return ke.ksym.sym;
-        default:
-            break;
-    }
-
-    int unicode = ke.ksym.unicode;
-
-    // convert Ctrl characters to their 0x40-0x5F counterparts:
-    if (unicode < ' ')
-    {
-        unicode += 'A' - 1;
-    }
-
-    // convert A-Z to their a-z counterparts:
-    if('A' <= unicode && unicode <= 'Z')
-    {
-        unicode += 'a' - 'A';
-    }
-
-    // convert various other punctuation marks:
-    if('\"' == unicode) unicode = '\'';
-    if('+' == unicode) unicode = '=';
-    if(':' == unicode) unicode = ';';
-    if('<' == unicode) unicode = ',';
-    if('>' == unicode) unicode = '.';
-    if('?' == unicode) unicode = '/';
-    if('{' == unicode) unicode = '[';
-    if('|' == unicode) unicode = '\\';
-    if('}' == unicode) unicode = ']';
-    if('~' == unicode) unicode = '`';
-
-    return unicode;
-}
-
 // returns true if the event is handled
-bool Core::DFH_SDL_Event(SDL::Event* ev)
+bool Core::DFH_SDL_Event(SDL_Event* ev)
 {
     // do NOT process events before we are ready.
     if(!started || !ev)
         return false;
 
-    if(ev->type == SDL::ET_ACTIVEEVENT && ev->active.gain)
-    {
+    if (ev->type == SDL_WINDOWEVENT && ev->window.event == SDL_WINDOWEVENT_FOCUS_GAINED) {
         // clear modstate when gaining focus in case alt-tab was used when
         // losing focus and modstate is now incorrectly set
         modstate = 0;
         return false;
     }
 
-    if(ev->type == SDL::ET_KEYDOWN || ev->type == SDL::ET_KEYUP)
-    {
-        auto ke = (SDL::KeyboardEvent *)ev;
+    if (ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP) {
+        auto &ke = ev->key;
 
-        if (ke->ksym.sym == SDL::K_LSHIFT || ke->ksym.sym == SDL::K_RSHIFT)
-            modstate = (ev->type == SDL::ET_KEYDOWN) ? modstate | DFH_MOD_SHIFT : modstate & ~DFH_MOD_SHIFT;
-        else if (ke->ksym.sym == SDL::K_LCTRL || ke->ksym.sym == SDL::K_RCTRL)
-            modstate = (ev->type == SDL::ET_KEYDOWN) ? modstate | DFH_MOD_CTRL : modstate & ~DFH_MOD_CTRL;
-        else if (ke->ksym.sym == SDL::K_LALT || ke->ksym.sym == SDL::K_RALT)
-            modstate = (ev->type == SDL::ET_KEYDOWN) ? modstate | DFH_MOD_ALT : modstate & ~DFH_MOD_ALT;
-        else if(ke->state == SDL::BTN_PRESSED && !hotkey_states[ke->ksym.sym])
+        if (ke.keysym.sym == SDLK_LSHIFT || ke.keysym.sym == SDLK_RSHIFT)
+            modstate = (ev->type == SDL_KEYDOWN) ? modstate | DFH_MOD_SHIFT : modstate & ~DFH_MOD_SHIFT;
+        else if (ke.keysym.sym == SDLK_LCTRL || ke.keysym.sym == SDLK_RCTRL)
+            modstate = (ev->type == SDL_KEYDOWN) ? modstate | DFH_MOD_CTRL : modstate & ~DFH_MOD_CTRL;
+        else if (ke.keysym.sym == SDLK_LALT || ke.keysym.sym == SDLK_RALT)
+            modstate = (ev->type == SDL_KEYDOWN) ? modstate | DFH_MOD_ALT : modstate & ~DFH_MOD_ALT;
+        else if (ke.state == SDL_PRESSED && !hotkey_states[ke.keysym.sym])
         {
-            hotkey_states[ke->ksym.sym] = true;
-
-            // Use unicode so Windows gives the correct value for the
-            // user's Input Language
-            if(ke->ksym.unicode && ((ke->ksym.unicode & 0xff80) == 0))
-            {
-                int key = UnicodeAwareSym(*ke);
-                SelectHotkey(key, modstate);
-            }
-            else
-            {
-                // Pretend non-ascii characters don't happen:
-                SelectHotkey(ke->ksym.sym, modstate);
-            }
+            hotkey_states[ke.keysym.sym] = true;
         }
-        else if(ke->state == SDL::BTN_RELEASED)
+        else if(ke.state == SDL_RELEASED)
         {
-            hotkey_states[ke->ksym.sym] = false;
+            hotkey_states[ke.keysym.sym] = false;
+        }
+    }
+    else if (ev->type == SDL_TEXTINPUT) {
+        auto &te = ev->text;
+
+        uint8_t sym = (uint8_t)te.text[0];
+        if (sym <= 0x7f && hotkey_states[sym]) {
+            // register that we have responded to this hotkey, and don't respond
+            // again even if the key is held down
+            hotkey_states[sym] = false;
+            SelectHotkey(sym, modstate);
         }
     }
     return false;
@@ -2455,8 +2403,8 @@ bool Core::SelectHotkey(int sym, int modifiers)
     while (screen->child)
         screen = screen->child;
 
-    if (sym == SDL::K_KP_ENTER)
-        sym = SDL::K_RETURN;
+    if (sym == SDLK_KP_ENTER)
+        sym = SDLK_RETURN;
 
     std::string cmd;
 
@@ -2497,7 +2445,7 @@ bool Core::SelectHotkey(int sym, int modifiers)
 
         if (cmd.empty()) {
             // Check the hotkey keybindings
-            int idx = sym - SDL::K_F1;
+            int idx = sym - SDLK_F1;
             if(idx >= 0 && idx < 8)
             {
 /* TODO: understand how this changes for v50
@@ -2555,22 +2503,22 @@ static bool parseKeySpec(std::string keyspec, int *psym, int *pmod, std::string
     }
 
     if (keyspec.size() == 1 && keyspec[0] >= 'A' && keyspec[0] <= 'Z') {
-        *psym = SDL::K_a + (keyspec[0]-'A');
+        *psym = SDLK_a + (keyspec[0]-'A');
         return true;
     } else if (keyspec.size() == 1 && keyspec[0] == '`') {
-        *psym = SDL::K_BACKQUOTE;
+        *psym = SDLK_BACKQUOTE;
         return true;
     } else if (keyspec.size() == 1 && keyspec[0] >= '0' && keyspec[0] <= '9') {
-        *psym = SDL::K_0 + (keyspec[0]-'0');
+        *psym = SDLK_0 + (keyspec[0]-'0');
         return true;
     } else if (keyspec.size() == 2 && keyspec[0] == 'F' && keyspec[1] >= '1' && keyspec[1] <= '9') {
-        *psym = SDL::K_F1 + (keyspec[1]-'1');
+        *psym = SDLK_F1 + (keyspec[1]-'1');
         return true;
     } else if (keyspec.size() == 3 && keyspec.substr(0, 2) == "F1" && keyspec[2] >= '0' && keyspec[2] <= '2') {
-        *psym = SDL::K_F10 + (keyspec[2]-'0');
+        *psym = SDLK_F10 + (keyspec[2]-'0');
         return true;
     } else if (keyspec == "Enter") {
-        *psym = SDL::K_RETURN;
+        *psym = SDLK_RETURN;
         return true;
     } else
         return false;
diff --git a/library/Hooks.cpp b/library/Hooks.cpp
index 4e339e768..31a8ec749 100644
--- a/library/Hooks.cpp
+++ b/library/Hooks.cpp
@@ -48,7 +48,7 @@ DFhackCExport void dfhooks_prerender() {
 
 // called from the main thread for each SDL event. if true is returned, then
 // the event has been consumed and further processing shouldn't happen
-DFhackCExport bool dfhooks_sdl_event(SDL::Event* event) {
+DFhackCExport bool dfhooks_sdl_event(SDL_Event* event) {
     if (disabled)
         return false;
     return DFHack::Core::getInstance().DFH_SDL_Event(event);
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 0a737875a..7de74470f 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2635,6 +2635,7 @@ static int screen_charToKey(lua_State *L)
     return 1;
 }
 
+/*
 static int screen_zoom(lua_State *L)
 {
     using df::global::enabler;
@@ -2651,6 +2652,7 @@ static int screen_zoom(lua_State *L)
     enabler->zoom_display(cmd);
     return 0;
 }
+*/
 
 }
 
@@ -2671,7 +2673,7 @@ static const luaL_Reg dfhack_screen_funcs[] = {
     { "_doSimulateInput", screen_doSimulateInput },
     { "keyToChar", screen_keyToChar },
     { "charToKey", screen_charToKey },
-    { "zoom", screen_zoom },
+    //{ "zoom", screen_zoom },
     { NULL, NULL }
 };
 
diff --git a/library/include/Core.h b/library/include/Core.h
index 696be4ead..916a63cf3 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -112,7 +112,7 @@ namespace DFHack
         friend void ::dfhooks_shutdown();
         friend void ::dfhooks_update();
         friend void ::dfhooks_prerender();
-        friend bool ::dfhooks_sdl_event(SDL::Event* event);
+        friend bool ::dfhooks_sdl_event(SDL_Event* event);
         friend bool ::dfhooks_ncurses_key(int key);
     public:
         /// Get the single Core instance or make one.
@@ -195,7 +195,7 @@ namespace DFHack
         bool InitSimulationThread();
         int Update (void);
         int Shutdown (void);
-        bool DFH_SDL_Event(SDL::Event* event);
+        bool DFH_SDL_Event(SDL_Event* event);
         bool ncurses_wgetch(int in, int & out);
         bool DFH_ncurses_key(int key);
 
diff --git a/library/include/Hooks.h b/library/include/Hooks.h
index 5856fb44f..fb72fdbe3 100644
--- a/library/include/Hooks.h
+++ b/library/include/Hooks.h
@@ -24,61 +24,11 @@ distribution.
 
 #pragma once
 
-/*
- *  Some much needed SDL fakery.
- */
-
-#include "Pragma.h"
-#include "Export.h"
-#include <string>
-#include <stdint.h>
-
-#include "modules/Graphic.h"
-
-// function and variable pointer... we don't try to understand what SDL does here
-typedef void * fPtr;
-typedef void * vPtr;
-struct WINDOW;
-namespace SDL
-{
-    union Event;
-}
-
-// these functions are here because they call into DFHack::Core and therefore need to
-// be declared as friend functions/known
-#ifdef _DARWIN
-DFhackCExport int DFH_SDL_NumJoysticks(void);
-DFhackCExport void DFH_SDL_Quit(void);
-DFhackCExport int DFH_SDL_PollEvent(SDL::Event* event);
-DFhackCExport int DFH_SDL_Init(uint32_t flags);
-DFhackCExport int DFH_wgetch(WINDOW * win);
-#endif
-DFhackCExport int SDL_NumJoysticks(void);
-DFhackCExport void SDL_Quit(void);
-DFhackCExport int SDL_PollEvent(SDL::Event* event);
-DFhackCExport int SDL_PushEvent(SDL::Event* event);
-DFhackCExport int SDL_Init(uint32_t flags);
-DFhackCExport int wgetch(WINDOW * win);
-
-DFhackCExport int SDL_UpperBlit(DFHack::DFSDL_Surface* src, DFHack::DFSDL_Rect* srcrect, DFHack::DFSDL_Surface* dst, DFHack::DFSDL_Rect* dstrect);
-DFhackCExport vPtr SDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth,
-                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFhackCExport vPtr SDL_CreateRGBSurfaceFrom(vPtr pixels, int width, int height, int depth, int pitch,
-                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFhackCExport void SDL_FreeSurface(vPtr surface);
-DFhackCExport vPtr SDL_ConvertSurface(vPtr surface, vPtr format, uint32_t flags);
-DFhackCExport int SDL_LockSurface(vPtr surface);
-DFhackCExport void SDL_UnlockSurface(vPtr surface);
-DFhackCExport uint8_t SDL_GetMouseState(int *x, int *y);
-DFhackCExport void * SDL_GetVideoSurface(void);
-
-DFhackCExport int SDL_SemWait(vPtr sem);
-DFhackCExport int SDL_SemPost(vPtr sem);
+union SDL_Event;
 
-// new Hooks API
 DFhackCExport void dfhooks_init();
 DFhackCExport void dfhooks_shutdown();
 DFhackCExport void dfhooks_update();
 DFhackCExport void dfhooks_prerender();
-DFhackCExport bool dfhooks_sdl_event(SDL::Event* event);
+DFhackCExport bool dfhooks_sdl_event(SDL_Event* event);
 DFhackCExport bool dfhooks_ncurses_key(int key);
diff --git a/library/include/SDL_events.h b/library/include/SDL_events.h
deleted file mode 100644
index 80067f07d..000000000
--- a/library/include/SDL_events.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-// Fake - only structs. Shamelessly pilfered from the SDL library.
-// Needed for processing its event types without polluting our namespaces with C garbage
-
-#pragma once
-#include "SDL_keyboard.h"
-
-namespace SDL
-{
-    enum ButtonState
-    {
-        BTN_RELEASED = 0,
-        BTN_PRESSED = 1
-    };
-
-    /** Event enumerations */
-    enum EventType
-    {
-           ET_NOEVENT = 0,         /**< Unused (do not remove) */
-           ET_ACTIVEEVENT,         /**< Application loses/gains visibility */
-           ET_KEYDOWN,             /**< Keys pressed */
-           ET_KEYUP,               /**< Keys released */
-           ET_MOUSEMOTION,         /**< Mouse moved */
-           ET_MOUSEBUTTONDOWN,     /**< Mouse button pressed */
-           ET_MOUSEBUTTONUP,       /**< Mouse button released */
-           ET_JOYAXISMOTION,       /**< Joystick axis motion */
-           ET_JOYBALLMOTION,       /**< Joystick trackball motion */
-           ET_JOYHATMOTION,        /**< Joystick hat position change */
-           ET_JOYBUTTONDOWN,       /**< Joystick button pressed */
-           ET_JOYBUTTONUP,         /**< Joystick button released */
-           ET_QUIT,                /**< User-requested quit */
-           ET_SYSWMEVENT,          /**< System specific event */
-           ET_EVENT_RESERVEDA,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVEDB,     /**< Reserved for future use.. */
-           ET_VIDEORESIZE,         /**< User resized video mode */
-           ET_VIDEOEXPOSE,         /**< Screen needs to be redrawn */
-           ET_EVENT_RESERVED2,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED3,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED4,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED5,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED6,     /**< Reserved for future use.. */
-           ET_EVENT_RESERVED7,     /**< Reserved for future use.. */
-           /** Events ET_USEREVENT through ET_MAXEVENTS-1 are for your use */
-           ET_USEREVENT = 24,
-           /** This last event is only for bounding internal arrays
-        *  It is the number of bits in the event mask datatype -- Uint32
-            */
-           ET_NUMEVENTS = 32
-    };
-
-    /** Application visibility event structure */
-     struct ActiveEvent
-    {
-        uint8_t type;     /**< ET_ACTIVEEVENT */
-        uint8_t gain;     /**< Whether given states were gained or lost (1/0) */
-        uint8_t state;    /**< A mask of the focus states */
-    };
-
-    /** Keyboard event structure */
-    struct KeyboardEvent
-    {
-        uint8_t type;     /**< ET_KEYDOWN or ET_KEYUP */
-        uint8_t which;    /**< The keyboard device index */
-        uint8_t state;    /**< BTN_PRESSED or BTN_RELEASED */
-        keysym ksym;
-    };
-
-    /** Mouse motion event structure */
-    struct MouseMotionEvent
-    {
-        uint8_t type;   /**< ET_MOUSEMOTION */
-        uint8_t which;  /**< The mouse device index */
-        uint8_t state;  /**< The current button state */
-        uint16_t x, y;  /**< The X/Y coordinates of the mouse */
-        int16_t xrel;   /**< The relative motion in the X direction */
-        int16_t yrel;   /**< The relative motion in the Y direction */
-    };
-
-    /** Mouse button event structure */
-    struct MouseButtonEvent
-    {
-        uint8_t type;   /**< ET_MOUSEBUTTONDOWN or ET_MOUSEBUTTONUP */
-        uint8_t which;  /**< The mouse device index */
-        uint8_t button; /**< The mouse button index */
-        uint8_t state;  /**< BTN_PRESSED or BTN_RELEASED */
-        uint16_t x, y;  /**< The X/Y coordinates of the mouse at press time */
-    };
-
-    /** Joystick axis motion event structure */
-    struct JoyAxisEvent
-    {
-        uint8_t type;   /**< ET_JOYAXISMOTION */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t axis;   /**< The joystick axis index */
-        int16_t value;  /**< The axis value (range: -32768 to 32767) */
-    };
-
-    /** Joystick trackball motion event structure */
-    struct JoyBallEvent
-    {
-        uint8_t type;   /**< ET_JOYBALLMOTION */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t ball;   /**< The joystick trackball index */
-        int16_t xrel;   /**< The relative motion in the X direction */
-        int16_t yrel;   /**< The relative motion in the Y direction */
-    };
-
-    /** Joystick hat position change event structure */
-    struct JoyHatEvent
-    {
-        uint8_t type;   /**< ET_JOYHATMOTION */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t hat;    /**< The joystick hat index */
-        uint8_t value;  /**< The hat position value:
-                         *   SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
-                         *   SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
-                         *   SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
-                         *  Note that zero means the POV is centered.
-                         */
-    };
-
-    /** Joystick button event structure */
-    struct JoyButtonEvent
-    {
-        uint8_t type;   /**< ET_JOYBUTTONDOWN or ET_JOYBUTTONUP */
-        uint8_t which;  /**< The joystick device index */
-        uint8_t button; /**< The joystick button index */
-        uint8_t state;  /**< BTN_PRESSED or BTN_RELEASED */
-    };
-
-    /** The "window resized" event
-     *  When you get this event, you are responsible for setting a new video
-     *  mode with the new width and height.
-     */
-    struct ResizeEvent
-    {
-        uint8_t type;   /**< ET_VIDEORESIZE */
-        int w;          /**< New width */
-        int h;          /**< New height */
-    };
-
-    /** The "screen redraw" event */
-    struct ExposeEvent
-    {
-        uint8_t type;   /**< ET_VIDEOEXPOSE */
-    };
-
-    /** The "quit requested" event */
-    struct QuitEvent
-    {
-        uint8_t type;   /**< ET_QUIT */
-    };
-
-    /** A user-defined event type */
-    struct UserEvent
-    {
-        uint8_t type;   /**< ETL_USEREVENT through ET_NUMEVENTS-1 */
-        int code;       /**< User defined event code */
-        void *data1;    /**< User defined data pointer */
-        void *data2;    /**< User defined data pointer */
-    };
-
-    /** If you want to use this event, you should include SDL_syswm.h */
-    struct SysWMmsg;
-    struct SysWMEvent
-    {
-        uint8_t type;
-        SysWMmsg *msg;
-    };
-
-    /** General event structure */
-    union Event
-    {
-        uint8_t type;
-        ActiveEvent active;
-        KeyboardEvent key;
-        MouseMotionEvent motion;
-        MouseButtonEvent button;
-        JoyAxisEvent jaxis;
-        JoyBallEvent jball;
-        JoyHatEvent jhat;
-        JoyButtonEvent jbutton;
-        ResizeEvent resize;
-        ExposeEvent expose;
-        QuitEvent quit;
-        UserEvent user;
-        SysWMEvent syswm;
-    };
-}
diff --git a/library/include/SDL_keyboard.h b/library/include/SDL_keyboard.h
deleted file mode 100644
index 1d58bd63f..000000000
--- a/library/include/SDL_keyboard.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-// Fake - only structs. Shamelessly pilfered from the SDL library.
-// Needed for processing its event types without polluting our namespaces with C garbage
-
-#pragma once
-#include "SDL_keysym.h"
-#include <stdint.h>
-
-namespace SDL
-{
-    /** Keysym structure
-     *
-     *  - The scancode is hardware dependent, and should not be used by general
-     *    applications.  If no hardware scancode is available, it will be 0.
-     *
-     *  - The 'unicode' translated character is only available when character
-     *    translation is enabled by the SDL_EnableUNICODE() API.  If non-zero,
-     *    this is a UNICODE character corresponding to the keypress.  If the
-     *    high 9 bits of the character are 0, then this maps to the equivalent
-     *    ASCII character:
-     *      @code
-     *  char ch;
-     *  if ( (keysym.unicode & 0xFF80) == 0 ) {
-     *      ch = keysym.unicode & 0x7F;
-     *  } else {
-     *      An international character..
-     *  }
-     *      @endcode
-     */
-    typedef struct keysym
-    {
-        uint8_t scancode;       /**< hardware specific scancode */
-        Key sym;             /**< SDL virtual keysym */
-        Mod mod;             /**< current key modifiers */
-        uint16_t unicode;         /**< translated character */
-    } keysym;
-
-    /** This is the mask which refers to all hotkey bindings */
-    #define ALL_HOTKEYS     0xFFFFFFFF
-}
diff --git a/library/include/SDL_keysym.h b/library/include/SDL_keysym.h
deleted file mode 100644
index e19f786af..000000000
--- a/library/include/SDL_keysym.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-// Fake - only structs. Shamelessly pilfered from the SDL library.
-// Needed for processing its event types without polluting our namespaces with C garbage
-
-#pragma once
-
-namespace SDL
-{
-    /** What we really want is a mapping of every raw key on the keyboard.
-     *  To support international keyboards, we use the range 0xA1 - 0xFF
-     *  as international virtual keycodes.  We'll follow in the footsteps of X11...
-     *  @brief The names of the keys
-     */
-    enum Key
-    {
-        /** @name ASCII mapped keysyms
-         *  The keyboard syms have been cleverly chosen to map to ASCII
-         */
-        /*@{*/
-        K_UNKNOWN        = 0,
-        K_FIRST      = 0,
-        K_BACKSPACE      = 8,
-        K_TAB        = 9,
-        K_CLEAR      = 12,
-        K_RETURN     = 13,
-        K_PAUSE      = 19,
-        K_ESCAPE     = 27,
-        K_SPACE      = 32,
-        K_EXCLAIM        = 33,
-        K_QUOTEDBL       = 34,
-        K_HASH       = 35,
-        K_DOLLAR     = 36,
-        K_AMPERSAND      = 38,
-        K_QUOTE      = 39,
-        K_LEFTPAREN      = 40,
-        K_RIGHTPAREN     = 41,
-        K_ASTERISK       = 42,
-        K_PLUS       = 43,
-        K_COMMA      = 44,
-        K_MINUS      = 45,
-        K_PERIOD     = 46,
-        K_SLASH      = 47,
-        K_0          = 48,
-        K_1          = 49,
-        K_2          = 50,
-        K_3          = 51,
-        K_4          = 52,
-        K_5          = 53,
-        K_6          = 54,
-        K_7          = 55,
-        K_8          = 56,
-        K_9          = 57,
-        K_COLON      = 58,
-        K_SEMICOLON      = 59,
-        K_LESS       = 60,
-        K_EQUALS     = 61,
-        K_GREATER        = 62,
-        K_QUESTION       = 63,
-        K_AT         = 64,
-        /*
-           Skip uppercase letters
-         */
-        K_LEFTBRACKET    = 91,
-        K_BACKSLASH      = 92,
-        K_RIGHTBRACKET   = 93,
-        K_CARET      = 94,
-        K_UNDERSCORE     = 95,
-        K_BACKQUOTE      = 96,
-        K_a          = 97,
-        K_b          = 98,
-        K_c          = 99,
-        K_d          = 100,
-        K_e          = 101,
-        K_f          = 102,
-        K_g          = 103,
-        K_h          = 104,
-        K_i          = 105,
-        K_j          = 106,
-        K_k          = 107,
-        K_l          = 108,
-        K_m          = 109,
-        K_n          = 110,
-        K_o          = 111,
-        K_p          = 112,
-        K_q          = 113,
-        K_r          = 114,
-        K_s          = 115,
-        K_t          = 116,
-        K_u          = 117,
-        K_v          = 118,
-        K_w          = 119,
-        K_x          = 120,
-        K_y          = 121,
-        K_z          = 122,
-        K_DELETE     = 127,
-        /* End of ASCII mapped keysyms */
-        /*@}*/
-
-        /** @name International keyboard syms */
-        /*@{*/
-        K_WORLD_0        = 160,      /* 0xA0 */
-        K_WORLD_1        = 161,
-        K_WORLD_2        = 162,
-        K_WORLD_3        = 163,
-        K_WORLD_4        = 164,
-        K_WORLD_5        = 165,
-        K_WORLD_6        = 166,
-        K_WORLD_7        = 167,
-        K_WORLD_8        = 168,
-        K_WORLD_9        = 169,
-        K_WORLD_10       = 170,
-        K_WORLD_11       = 171,
-        K_WORLD_12       = 172,
-        K_WORLD_13       = 173,
-        K_WORLD_14       = 174,
-        K_WORLD_15       = 175,
-        K_WORLD_16       = 176,
-        K_WORLD_17       = 177,
-        K_WORLD_18       = 178,
-        K_WORLD_19       = 179,
-        K_WORLD_20       = 180,
-        K_WORLD_21       = 181,
-        K_WORLD_22       = 182,
-        K_WORLD_23       = 183,
-        K_WORLD_24       = 184,
-        K_WORLD_25       = 185,
-        K_WORLD_26       = 186,
-        K_WORLD_27       = 187,
-        K_WORLD_28       = 188,
-        K_WORLD_29       = 189,
-        K_WORLD_30       = 190,
-        K_WORLD_31       = 191,
-        K_WORLD_32       = 192,
-        K_WORLD_33       = 193,
-        K_WORLD_34       = 194,
-        K_WORLD_35       = 195,
-        K_WORLD_36       = 196,
-        K_WORLD_37       = 197,
-        K_WORLD_38       = 198,
-        K_WORLD_39       = 199,
-        K_WORLD_40       = 200,
-        K_WORLD_41       = 201,
-        K_WORLD_42       = 202,
-        K_WORLD_43       = 203,
-        K_WORLD_44       = 204,
-        K_WORLD_45       = 205,
-        K_WORLD_46       = 206,
-        K_WORLD_47       = 207,
-        K_WORLD_48       = 208,
-        K_WORLD_49       = 209,
-        K_WORLD_50       = 210,
-        K_WORLD_51       = 211,
-        K_WORLD_52       = 212,
-        K_WORLD_53       = 213,
-        K_WORLD_54       = 214,
-        K_WORLD_55       = 215,
-        K_WORLD_56       = 216,
-        K_WORLD_57       = 217,
-        K_WORLD_58       = 218,
-        K_WORLD_59       = 219,
-        K_WORLD_60       = 220,
-        K_WORLD_61       = 221,
-        K_WORLD_62       = 222,
-        K_WORLD_63       = 223,
-        K_WORLD_64       = 224,
-        K_WORLD_65       = 225,
-        K_WORLD_66       = 226,
-        K_WORLD_67       = 227,
-        K_WORLD_68       = 228,
-        K_WORLD_69       = 229,
-        K_WORLD_70       = 230,
-        K_WORLD_71       = 231,
-        K_WORLD_72       = 232,
-        K_WORLD_73       = 233,
-        K_WORLD_74       = 234,
-        K_WORLD_75       = 235,
-        K_WORLD_76       = 236,
-        K_WORLD_77       = 237,
-        K_WORLD_78       = 238,
-        K_WORLD_79       = 239,
-        K_WORLD_80       = 240,
-        K_WORLD_81       = 241,
-        K_WORLD_82       = 242,
-        K_WORLD_83       = 243,
-        K_WORLD_84       = 244,
-        K_WORLD_85       = 245,
-        K_WORLD_86       = 246,
-        K_WORLD_87       = 247,
-        K_WORLD_88       = 248,
-        K_WORLD_89       = 249,
-        K_WORLD_90       = 250,
-        K_WORLD_91       = 251,
-        K_WORLD_92       = 252,
-        K_WORLD_93       = 253,
-        K_WORLD_94       = 254,
-        K_WORLD_95       = 255,      /* 0xFF */
-        /*@}*/
-
-        /** @name Numeric keypad */
-        /*@{*/
-        K_KP0        = 256,
-        K_KP1        = 257,
-        K_KP2        = 258,
-        K_KP3        = 259,
-        K_KP4        = 260,
-        K_KP5        = 261,
-        K_KP6        = 262,
-        K_KP7        = 263,
-        K_KP8        = 264,
-        K_KP9        = 265,
-        K_KP_PERIOD      = 266,
-        K_KP_DIVIDE      = 267,
-        K_KP_MULTIPLY    = 268,
-        K_KP_MINUS       = 269,
-        K_KP_PLUS        = 270,
-        K_KP_ENTER       = 271,
-        K_KP_EQUALS      = 272,
-        /*@}*/
-
-        /** @name Arrows + Home/End pad */
-        /*@{*/
-        K_UP         = 273,
-        K_DOWN       = 274,
-        K_RIGHT      = 275,
-        K_LEFT       = 276,
-        K_INSERT     = 277,
-        K_HOME       = 278,
-        K_END        = 279,
-        K_PAGEUP     = 280,
-        K_PAGEDOWN       = 281,
-        /*@}*/
-
-        /** @name Function keys */
-        /*@{*/
-        K_F1         = 282,
-        K_F2         = 283,
-        K_F3         = 284,
-        K_F4         = 285,
-        K_F5         = 286,
-        K_F6         = 287,
-        K_F7         = 288,
-        K_F8         = 289,
-        K_F9         = 290,
-        K_F10        = 291,
-        K_F11        = 292,
-        K_F12        = 293,
-        K_F13        = 294,
-        K_F14        = 295,
-        K_F15        = 296,
-        /*@}*/
-
-        /** @name Key state modifier keys */
-        /*@{*/
-        K_NUMLOCK        = 300,
-        K_CAPSLOCK       = 301,
-        K_SCROLLOCK      = 302,
-        K_RSHIFT     = 303,
-        K_LSHIFT     = 304,
-        K_RCTRL      = 305,
-        K_LCTRL      = 306,
-        K_RALT       = 307,
-        K_LALT       = 308,
-        K_RMETA      = 309,
-        K_LMETA      = 310,
-        K_LSUPER     = 311,      /**< Left "Windows" key */
-        K_RSUPER     = 312,      /**< Right "Windows" key */
-        K_MODE       = 313,      /**< "Alt Gr" key */
-        K_COMPOSE        = 314,      /**< Multi-key compose key */
-        /*@}*/
-
-        /** @name Miscellaneous function keys */
-        /*@{*/
-        K_HELP       = 315,
-        K_PRINT      = 316,
-        K_SYSREQ     = 317,
-        K_BREAK      = 318,
-        K_MENU       = 319,
-        K_POWER      = 320,      /**< Power Macintosh power key */
-        K_EURO       = 321,      /**< Some european keyboards */
-        K_UNDO       = 322,      /**< Atari keyboard has Undo */
-        /*@}*/
-
-        /* Add any other keys here */
-
-        K_LAST
-    };
-
-    /** Enumeration of valid key mods (possibly OR'd together) */
-    enum Mod {
-        KMOD_NONE  = 0x0000,
-        KMOD_LSHIFT= 0x0001,
-        KMOD_RSHIFT= 0x0002,
-        KMOD_LCTRL = 0x0040,
-        KMOD_RCTRL = 0x0080,
-        KMOD_LALT  = 0x0100,
-        KMOD_RALT  = 0x0200,
-        KMOD_LMETA = 0x0400,
-        KMOD_RMETA = 0x0800,
-        KMOD_NUM   = 0x1000,
-        KMOD_CAPS  = 0x2000,
-        KMOD_MODE  = 0x4000,
-        KMOD_RESERVED = 0x8000,
-        KMOD_CTRL  = (KMOD_LCTRL|KMOD_RCTRL),
-        KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT),
-        KMOD_ALT   = (KMOD_LALT|KMOD_RALT),
-        KMOD_META  = (KMOD_LMETA|KMOD_RMETA)
-    };
-}
diff --git a/library/include/df/custom/enabler.methods.inc b/library/include/df/custom/enabler.methods.inc
index b06af2345..5cc584bc2 100644
--- a/library/include/df/custom/enabler.methods.inc
+++ b/library/include/df/custom/enabler.methods.inc
@@ -1,6 +1,8 @@
 void zoom_display(df::zoom_commands command) {
+    /*
     DFHack::DFSDL::DFSDL_SemWait(async_zoom.sem);
     async_zoom.queue.push_back(command);
     DFHack::DFSDL::DFSDL_SemPost(async_zoom.sem);
     DFHack::DFSDL::DFSDL_SemPost(async_zoom.sem_fill);
+    */
 }
diff --git a/library/include/modules/DFSDL.h b/library/include/modules/DFSDL.h
index 9f07ea3db..fc65fab34 100644
--- a/library/include/modules/DFSDL.h
+++ b/library/include/modules/DFSDL.h
@@ -3,60 +3,19 @@
 #include "Export.h"
 #include "ColorText.h"
 
+struct SDL_Surface;
+struct SDL_Rect;
+struct SDL_PixelFormat;
+union SDL_Event;
+
 namespace DFHack
 {
-    // SDL stand-in type definitions
-    typedef signed short SINT16;
-    typedef void DFSDL_sem;
-    typedef void DFSDL_Event;
-
-    typedef struct
-    {
-        int16_t x, y;
-        uint16_t w, h;
-    } DFSDL_Rect;
-    typedef struct
-    {
-        void *palette; // SDL_Palette*
-        uint8_t  BitsPerPixel;
-        uint8_t  BytesPerPixel;
-        uint8_t  Rloss;
-        uint8_t  Gloss;
-        uint8_t  Bloss;
-        uint8_t  Aloss;
-        uint8_t  Rshift;
-        uint8_t  Gshift;
-        uint8_t  Bshift;
-        uint8_t  Ashift;
-        uint32_t Rmask;
-        uint32_t Gmask;
-        uint32_t Bmask;
-        uint32_t Amask;
-        uint32_t colorkey;
-        uint8_t  alpha;
-    } DFSDL_PixelFormat;
-    typedef struct
-    {
-        uint32_t flags;
-        DFSDL_PixelFormat* format;
-        int w, h;
-        int pitch;
-        void* pixels;
-        void* userdata; // as far as i could see DF doesnt use this
-        int locked;
-        void* lock_data;
-        DFSDL_Rect clip_rect;
-        void* map;
-        int refcount;
-    } DFSDL_Surface;
-
-    // =========
     struct DFTileSurface
     {
         bool paintOver; // draw over original tile?
-        DFSDL_Surface* surface; // from where it should be drawn
-        DFSDL_Rect* rect; // from which coords (NULL to draw whole surface)
-        DFSDL_Rect* dstResize; // if not NULL dst rect will be resized (x/y/w/h will be added to original dst)
+        SDL_Surface* surface; // from where it should be drawn
+        SDL_Rect* rect; // from which coords (NULL to draw whole surface)
+        SDL_Rect* dstResize; // if not NULL dst rect will be resized (x/y/w/h will be added to original dst)
     };
 
 /**
@@ -79,17 +38,17 @@ bool init(DFHack::color_ostream &out);
  */
 void cleanup();
 
-DFHACK_EXPORT DFSDL_Surface * DFIMG_Load(const char *file);
-DFHACK_EXPORT int DFSDL_SetAlpha(DFSDL_Surface *surface, uint32_t flag, uint8_t alpha);
-DFHACK_EXPORT DFSDL_Surface * DFSDL_GetVideoSurface(void);
-DFHACK_EXPORT DFSDL_Surface * DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFHACK_EXPORT DFSDL_Surface * DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFHACK_EXPORT int DFSDL_UpperBlit(DFSDL_Surface *src, const DFSDL_Rect *srcrect, DFSDL_Surface *dst, DFSDL_Rect *dstrect);
-DFHACK_EXPORT DFSDL_Surface * DFSDL_ConvertSurface(DFSDL_Surface *src, const DFSDL_PixelFormat *fmt, uint32_t flags);
-DFHACK_EXPORT void DFSDL_FreeSurface(DFSDL_Surface *surface);
-DFHACK_EXPORT int DFSDL_SemWait(DFSDL_sem *sem);
-DFHACK_EXPORT int DFSDL_SemPost(DFSDL_sem *sem);
-DFHACK_EXPORT int DFSDL_PushEvent(DFSDL_Event *event);
+DFHACK_EXPORT SDL_Surface * DFIMG_Load(const char *file);
+DFHACK_EXPORT int DFSDL_SetAlpha(SDL_Surface *surface, uint32_t flag, uint8_t alpha);
+DFHACK_EXPORT SDL_Surface * DFSDL_GetVideoSurface(void);
+DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
+DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
+DFHACK_EXPORT int DFSDL_UpperBlit(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);
+DFHACK_EXPORT SDL_Surface * DFSDL_ConvertSurface(SDL_Surface *src, const SDL_PixelFormat *fmt, uint32_t flags);
+DFHACK_EXPORT void DFSDL_FreeSurface(SDL_Surface *surface);
+// DFHACK_EXPORT int DFSDL_SemWait(SDL_sem *sem);
+// DFHACK_EXPORT int DFSDL_SemPost(SDL_sem *sem);
+DFHACK_EXPORT int DFSDL_PushEvent(SDL_Event *event);
 
 }
 
diff --git a/library/include/modules/Screen.h b/library/include/modules/Screen.h
index c21e3ad32..887fb5f75 100644
--- a/library/include/modules/Screen.h
+++ b/library/include/modules/Screen.h
@@ -191,7 +191,7 @@ namespace DFHack
         }
 
         /// Wrapper to call enabler->zoom_display from plugins
-        DFHACK_EXPORT void zoom(df::zoom_commands cmd);
+        //DFHACK_EXPORT void zoom(df::zoom_commands cmd);
 
         /// Returns the state of [GRAPHICS:YES/NO]
         DFHACK_EXPORT bool inGraphicsMode();
diff --git a/library/modules/DFSDL.cpp b/library/modules/DFSDL.cpp
index b95b6302a..36e8e1a41 100644
--- a/library/modules/DFSDL.cpp
+++ b/library/modules/DFSDL.cpp
@@ -14,29 +14,29 @@ using namespace DFHack;
 static DFLibrary *g_sdl_handle = nullptr;
 static DFLibrary *g_sdl_image_handle = nullptr;
 static const std::vector<std::string> SDL_LIBS {
-    "SDL.dll",
+    "SDL2.dll",
     "SDL.framework/Versions/A/SDL",
     "SDL.framework/SDL",
-    "libSDL-1.2.so.0"
+    "libSDL2-2.0.so.0"
 };
 static const std::vector<std::string> SDL_IMAGE_LIBS {
-    "SDL_image.dll",
+    "SDL2_image.dll",
     "SDL_image.framework/Versions/A/SDL_image",
     "SDL_image.framework/SDL_image",
-    "libSDL_image-1.2.so.0"
+    "libSDL2_image-2.0.so.0"
 };
 
-DFSDL_Surface * (*g_IMG_Load)(const char *) = nullptr;
-int (*g_SDL_SetAlpha)(DFSDL_Surface *, uint32_t, uint8_t) = nullptr;
-DFSDL_Surface * (*g_SDL_GetVideoSurface)(void) = nullptr;
-DFSDL_Surface * (*g_SDL_CreateRGBSurface)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t) = nullptr;
-DFSDL_Surface * (*g_SDL_CreateRGBSurfaceFrom)(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = nullptr;
-int (*g_SDL_UpperBlit)(DFSDL_Surface *, const DFSDL_Rect *, DFSDL_Surface *, DFSDL_Rect *) = nullptr;
-DFSDL_Surface * (*g_SDL_ConvertSurface)(DFSDL_Surface *, const DFSDL_PixelFormat *, uint32_t) = nullptr;
-void (*g_SDL_FreeSurface)(DFSDL_Surface *) = nullptr;
-int (*g_SDL_SemWait)(DFSDL_sem *) = nullptr;
-int (*g_SDL_SemPost)(DFSDL_sem *) = nullptr;
-int (*g_SDL_PushEvent)(DFSDL_Event *) = nullptr;
+SDL_Surface * (*g_IMG_Load)(const char *) = nullptr;
+int (*g_SDL_SetAlpha)(SDL_Surface *, uint32_t, uint8_t) = nullptr;
+SDL_Surface * (*g_SDL_GetVideoSurface)(void) = nullptr;
+SDL_Surface * (*g_SDL_CreateRGBSurface)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t) = nullptr;
+SDL_Surface * (*g_SDL_CreateRGBSurfaceFrom)(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = nullptr;
+int (*g_SDL_UpperBlit)(SDL_Surface *, const SDL_Rect *, SDL_Surface *, SDL_Rect *) = nullptr;
+SDL_Surface * (*g_SDL_ConvertSurface)(SDL_Surface *, const SDL_PixelFormat *, uint32_t) = nullptr;
+void (*g_SDL_FreeSurface)(SDL_Surface *) = nullptr;
+// int (*g_SDL_SemWait)(DFSDL_sem *) = nullptr;
+// int (*g_SDL_SemPost)(DFSDL_sem *) = nullptr;
+int (*g_SDL_PushEvent)(SDL_Event *) = nullptr;
 
 bool DFSDL::init(color_ostream &out) {
     for (auto &lib_str : SDL_LIBS) {
@@ -72,8 +72,8 @@ bool DFSDL::init(color_ostream &out) {
     bind(g_sdl_handle, SDL_UpperBlit);
     bind(g_sdl_handle, SDL_ConvertSurface);
     bind(g_sdl_handle, SDL_FreeSurface);
-    bind(g_sdl_handle, SDL_SemWait);
-    bind(g_sdl_handle, SDL_SemPost);
+    // bind(g_sdl_handle, SDL_SemWait);
+    // bind(g_sdl_handle, SDL_SemPost);
     bind(g_sdl_handle, SDL_PushEvent);
     #undef bind
 
@@ -93,46 +93,46 @@ void DFSDL::cleanup() {
     }
 }
 
-DFSDL_Surface * DFSDL::DFIMG_Load(const char *file) {
+SDL_Surface * DFSDL::DFIMG_Load(const char *file) {
     return g_IMG_Load(file);
 }
 
-int DFSDL::DFSDL_SetAlpha(DFSDL_Surface *surface, uint32_t flag, uint8_t alpha) {
+int DFSDL::DFSDL_SetAlpha(SDL_Surface *surface, uint32_t flag, uint8_t alpha) {
     return g_SDL_SetAlpha(surface, flag, alpha);
 }
 
-DFSDL_Surface * DFSDL::DFSDL_GetVideoSurface(void) {
+SDL_Surface * DFSDL::DFSDL_GetVideoSurface(void) {
     return g_SDL_GetVideoSurface();
 }
 
-DFSDL_Surface * DFSDL::DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
+SDL_Surface * DFSDL::DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
     return g_SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask);
 }
 
-DFSDL_Surface * DFSDL::DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
+SDL_Surface * DFSDL::DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
     return g_SDL_CreateRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask);
 }
 
-int DFSDL::DFSDL_UpperBlit(DFSDL_Surface *src, const DFSDL_Rect *srcrect, DFSDL_Surface *dst, DFSDL_Rect *dstrect) {
+int DFSDL::DFSDL_UpperBlit(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) {
     return g_SDL_UpperBlit(src, srcrect, dst, dstrect);
 }
 
-DFSDL_Surface * DFSDL::DFSDL_ConvertSurface(DFSDL_Surface *src, const DFSDL_PixelFormat *fmt, uint32_t flags) {
+SDL_Surface * DFSDL::DFSDL_ConvertSurface(SDL_Surface *src, const SDL_PixelFormat *fmt, uint32_t flags) {
     return g_SDL_ConvertSurface(src, fmt, flags);
 }
 
-void DFSDL::DFSDL_FreeSurface(DFSDL_Surface *surface) {
+void DFSDL::DFSDL_FreeSurface(SDL_Surface *surface) {
     g_SDL_FreeSurface(surface);
 }
 
-int DFSDL::DFSDL_SemWait(DFSDL_sem *sem) {
-    return g_SDL_SemWait(sem);
-}
+// int DFSDL::DFSDL_SemWait(DFSDL_sem *sem) {
+//     return g_SDL_SemWait(sem);
+// }
 
-int DFSDL::DFSDL_SemPost(DFSDL_sem *sem) {
-    return g_SDL_SemPost(sem);
-}
+// int DFSDL::DFSDL_SemPost(DFSDL_sem *sem) {
+//     return g_SDL_SemPost(sem);
+// }
 
-int DFSDL::DFSDL_PushEvent(DFSDL_Event *event) {
+int DFSDL::DFSDL_PushEvent(SDL_Event *event) {
     return g_SDL_PushEvent(event);
 }
diff --git a/library/modules/Screen.cpp b/library/modules/Screen.cpp
index 6ccf246aa..a36f387b6 100644
--- a/library/modules/Screen.cpp
+++ b/library/modules/Screen.cpp
@@ -106,9 +106,11 @@ df::coord2d Screen::getWindowSize()
     return df::coord2d(gps->dimx, gps->dimy);
 }
 
+/*
 void Screen::zoom(df::zoom_commands cmd) {
     enabler->zoom_display(cmd);
 }
+*/
 
 bool Screen::inGraphicsMode()
 {
diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp
index a30f879a0..21aadf2da 100644
--- a/library/modules/Textures.cpp
+++ b/library/modules/Textures.cpp
@@ -8,6 +8,8 @@
 
 #include "df/enabler.h"
 
+#include <SDL_surface.h>
+
 using df::global::enabler;
 using namespace DFHack;
 using namespace DFHack::DFSDL;
@@ -37,26 +39,34 @@ static long g_window_borders_texpos_start = -1;
 //
 // It uses the same pixel format (RGBA, R at lowest address) regardless of
 // hardware.
-DFSDL_Surface * canonicalize_format(DFSDL_Surface *src) {
-  DFSDL_PixelFormat fmt;
+SDL_Surface * canonicalize_format(SDL_Surface *src) {
+  SDL_PixelFormat fmt;
   fmt.palette = NULL;
   fmt.BitsPerPixel = 32;
   fmt.BytesPerPixel = 4;
   fmt.Rloss = fmt.Gloss = fmt.Bloss = fmt.Aloss = 0;
-//#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-//  fmt.Rshift = 24; fmt.Gshift = 16; fmt.Bshift = 8; fmt.Ashift = 0;
-//#else
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+  fmt.Rshift = 24; fmt.Gshift = 16; fmt.Bshift = 8; fmt.Ashift = 0;
+#else
   fmt.Rshift = 0; fmt.Gshift = 8; fmt.Bshift = 16; fmt.Ashift = 24;
-//#endif
+#endif
   fmt.Rmask = 255 << fmt.Rshift;
   fmt.Gmask = 255 << fmt.Gshift;
   fmt.Bmask = 255 << fmt.Bshift;
   fmt.Amask = 255 << fmt.Ashift;
-  fmt.colorkey = 0;
-  fmt.alpha = 255;
 
-  DFSDL_Surface *tgt = DFSDL_ConvertSurface(src, &fmt, 0); // SDL_SWSURFACE
+  SDL_Surface *tgt = DFSDL_ConvertSurface(src, &fmt, SDL_SWSURFACE);
   DFSDL_FreeSurface(src);
+  for (int x = 0; x < tgt->w; ++x) {
+      for (int y = 0; y < tgt->h; ++y) {
+          Uint8* p = (Uint8*)tgt->pixels + y * tgt->pitch + x * 4;
+          if (p[3] == 0) {
+              for (int c = 0; c < 3; c++) {
+                  p[c] = 0;
+              }
+          }
+      }
+  }
   return tgt;
 }
 
@@ -65,7 +75,7 @@ const uint32_t TILE_HEIGHT_PX = 12;
 
 static size_t load_textures(color_ostream & out, const char * fname,
                             long *texpos_start) {
-    DFSDL_Surface *s = DFIMG_Load(fname);
+    SDL_Surface *s = DFIMG_Load(fname);
     if (!s) {
         out.printerr("unable to load textures from '%s'\n", fname);
         return 0;
@@ -78,12 +88,12 @@ static size_t load_textures(color_ostream & out, const char * fname,
     long count = 0;
     for (int y = 0; y < dimy; y++) {
         for (int x = 0; x < dimx; x++) {
-            DFSDL_Surface *tile = DFSDL_CreateRGBSurface(0, // SDL_SWSURFACE
+            SDL_Surface *tile = DFSDL_CreateRGBSurface(0, // SDL_SWSURFACE
                     TILE_WIDTH_PX, TILE_HEIGHT_PX, 32,
                     s->format->Rmask, s->format->Gmask, s->format->Bmask,
                     s->format->Amask);
             DFSDL_SetAlpha(tile, 0,255);
-            DFSDL_Rect vp;
+            SDL_Rect vp;
             vp.x = TILE_WIDTH_PX * x;
             vp.y = TILE_HEIGHT_PX * y;
             vp.w = TILE_WIDTH_PX;
@@ -161,7 +171,7 @@ void Textures::cleanup() {
     auto &raws = textures.raws;
     size_t texpos_end = g_dfhack_logo_texpos_start + g_num_dfhack_textures;
     for (size_t idx = g_dfhack_logo_texpos_start; idx <= texpos_end; ++idx) {
-        DFSDL_FreeSurface((DFSDL_Surface *)raws[idx]);
+        DFSDL_FreeSurface((SDL_Surface *)raws[idx]);
         raws[idx] = NULL;
     }
 
diff --git a/library/xml b/library/xml
index 916a49700..bff3a12b3 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 916a497000651b64272dacda3a5005650d3c0c68
+Subproject commit bff3a12b3863f54c5c2f3031c1726f7e28a9e70e
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 56d29371b..6ca69d1a7 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -14,8 +14,6 @@
 #include "PluginManager.h"
 #include "RemoteFortressReader.pb.h"
 #include "RemoteServer.h"
-#include "SDL_events.h"
-#include "SDL_keyboard.h"
 #include "TileTypes.h"
 #include "VersionInfo.h"
 #if DF_VERSION_INT > 34011
@@ -126,6 +124,9 @@
 #include "dwarf_control.h"
 #include "item_reader.h"
 
+#include <SDL_events.h>
+#include <SDL_keyboard.h>
+
 using namespace DFHack;
 using namespace df::enums;
 using namespace RemoteFortressReader;
@@ -2894,13 +2895,12 @@ static command_result CopyScreen(color_ostream &stream, const EmptyMessage *in,
 static command_result PassKeyboardEvent(color_ostream &stream, const KeyboardEvent *in)
 {
 #if DF_VERSION_INT > 34011
-    SDL::Event e;
+    SDL_Event e;
     e.key.type = in->type();
     e.key.state = in->state();
-    e.key.ksym.mod = (SDL::Mod)in->mod();
-    e.key.ksym.scancode = in->scancode();
-    e.key.ksym.sym = (SDL::Key)in->sym();
-    e.key.ksym.unicode = in->unicode();
+    e.key.keysym.mod = in->mod();
+    e.key.keysym.scancode = (SDL_Scancode)in->scancode();
+    e.key.keysym.sym = in->sym();
     DFHack::DFSDL::DFSDL_PushEvent(&e);
 #endif
     return CR_OK;