diff --git a/acinclude.m4 b/acinclude.m4
index 655b2209..f62d977f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -55,7 +55,7 @@ dnl
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "SDL.h"
+#include <SDL.h>
 
 char*
 my_strdup (char *str)
@@ -132,7 +132,7 @@ int main (int argc, char *argv[])
           LIBS="$LIBS $SDL_LIBS"
           AC_TRY_LINK([
 #include <stdio.h>
-#include "SDL.h"
+#include <SDL.h>
 ],      [ return 0; ],
         [ echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"
diff --git a/include/ipx.h b/include/ipx.h
index fb88c0d9..04ad748e 100644
--- a/include/ipx.h
+++ b/include/ipx.h
@@ -16,7 +16,6 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef DOSBOX_IPX_H
 #define DOSBOX_IPX_H
 
@@ -70,7 +69,7 @@
 #endif
 
 // For Uint8 type
-#include "SDL_net.h"
+#include <SDL_net.h>
 
 struct PackedIP {
 	Uint32 host;
diff --git a/include/ipxserver.h b/include/ipxserver.h
index b4fa9fe8..055416fe 100644
--- a/include/ipxserver.h
+++ b/include/ipxserver.h
@@ -21,7 +21,7 @@
 
 #if C_IPX
 
-#include "SDL_net.h"
+#include <SDL_net.h>
 
 struct packetBuffer {
 	Bit8u buffer[1024];
diff --git a/src/gui/midi.cpp b/src/gui/midi.cpp
index 28b65f46..a4002a6a 100644
--- a/src/gui/midi.cpp
+++ b/src/gui/midi.cpp
@@ -22,7 +22,7 @@
 #include <string>
 #include <algorithm>
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include "dosbox.h"
 #include "midi.h"
diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp
index f516e6de..26d9eded 100644
--- a/src/gui/sdl_gui.cpp
+++ b/src/gui/sdl_gui.cpp
@@ -18,7 +18,7 @@
 
 
 #if 0
-#include "SDL.h"
+#include <SDL.h>
 #include "../libs/gui_tk/gui_tk.h"
 
 #include "dosbox.h"
diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp
index 9c87d051..e424b5e9 100644
--- a/src/gui/sdl_mapper.cpp
+++ b/src/gui/sdl_mapper.cpp
@@ -29,8 +29,8 @@
 #include <list>
 #include <vector>
 
-#include "SDL.h"
-#include "SDL_thread.h"
+#include <SDL.h>
+#include <SDL_thread.h>
 
 #include "joystick.h"
 #include "keyboard.h"
@@ -2556,11 +2556,7 @@ void MAPPER_Init(void) {
 		}
 	}
 }
-//Somehow including them at the top conflicts with something in setup.h
-#ifdef C_X11_XKB
-#include "SDL_syswm.h"
-#include <X11/XKBlib.h>
-#endif
+
 void MAPPER_StartUp(Section * sec) {
 	Section_prop * section=static_cast<Section_prop *>(sec);
 	mapper.sticks.num=0;
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 20e24372..e02d7de1 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -21,6 +21,8 @@
 #define _GNU_SOURCE
 #endif
 
+#include "dosbox.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -32,10 +34,12 @@
 #include <process.h>
 #endif
 
-#include "cross.h"
-#include "SDL.h"
+#include <SDL.h>
+#if C_OPENGL
+#include <SDL_opengl.h>
+#endif
 
-#include "dosbox.h"
+#include "cross.h"
 #include "video.h"
 #include "mouse.h"
 #include "pic.h"
@@ -47,18 +51,17 @@
 #include "vga.h"
 #include "keyboard.h"
 #include "cpu.h"
-#include "cross.h"
 #include "control.h"
 
 #define MAPPERFILE "mapper-sdl2-" VERSION ".map"
 //#define DISABLE_JOYSTICK
 
 #if C_OPENGL
-#include "SDL_opengl.h"
 
 #ifndef APIENTRY
 #define APIENTRY
 #endif
+
 #ifndef APIENTRYP
 #define APIENTRYP APIENTRY *
 #endif
@@ -88,7 +91,7 @@ PFNGLBUFFERDATAARBPROC glBufferDataARB = NULL;
 PFNGLMAPBUFFERARBPROC glMapBufferARB = NULL;
 PFNGLUNMAPBUFFERARBPROC glUnmapBufferARB = NULL;
 
-#endif //C_OPENGL
+#endif // C_OPENGL
 
 #if !(ENVIRON_INCLUDED)
 extern char** environ;
diff --git a/src/hardware/ipx.cpp b/src/hardware/ipx.cpp
index 9783df28..b4621dd5 100644
--- a/src/hardware/ipx.cpp
+++ b/src/hardware/ipx.cpp
@@ -16,11 +16,12 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #include "dosbox.h"
 
 #if C_IPX
 
+#include <SDL_net.h>
+
 #include <string.h>
 #include <time.h>
 #include <stdio.h>
@@ -37,7 +38,6 @@
 #include "ipx.h"
 #include "ipxserver.h"
 #include "timer.h"
-#include "SDL_net.h"
 #include "programs.h"
 #include "pic.h"
 
diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp
index 132d335f..96fac84e 100644
--- a/src/hardware/mixer.cpp
+++ b/src/hardware/mixer.cpp
@@ -38,7 +38,8 @@
 #include <mmsystem.h>
 #endif
 
-#include "SDL.h"
+#include <SDL.h>
+
 #include "mem.h"
 #include "pic.h"
 #include "dosbox.h"
diff --git a/src/hardware/serialport/misc_util.h b/src/hardware/serialport/misc_util.h
index b6cab9eb..c90966a5 100644
--- a/src/hardware/serialport/misc_util.h
+++ b/src/hardware/serialport/misc_util.h
@@ -16,7 +16,6 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef SDLNETWRAPPER_H
 #define SDLNETWRAPPER_H
 
@@ -58,13 +57,10 @@
  #define CAPWORD NETWRAPPER_TCP
 #endif
 
-#include "SDL_net.h"
-
-
+#include <SDL_net.h>
 
 Bit32u Netwrapper_GetCapabilities();
 
-
 class TCPClientSocket {
 	public:
 	TCPClientSocket(TCPsocket source);
diff --git a/src/ints/bios_keyboard.cpp b/src/ints/bios_keyboard.cpp
index 6463f8b5..94e146c5 100644
--- a/src/ints/bios_keyboard.cpp
+++ b/src/ints/bios_keyboard.cpp
@@ -16,6 +16,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <SDL.h>
 
 #include "dosbox.h"
 #include "callback.h"
@@ -25,7 +26,6 @@
 #include "regs.h"
 #include "inout.h"
 #include "dos_inc.h"
-#include "SDL.h"
 
 static Bitu call_int16,call_irq1,call_irq6;