diff --git a/Makefile b/Makefile
index 9b51a3883d..823855cbe0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ include config.mk
 
 TARGET = ssnes tools/ssnes-joyconfig
 
-OBJ = ssnes.o file.o driver.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o strl.o getopt.o screenshot.o audio/utils.o
-JOYCONFIG_OBJ = tools/ssnes-joyconfig.o conf/config_file.o strl.o
+OBJ = ssnes.o file.o driver.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o compat/strl.o compat/getopt.o screenshot.o audio/utils.o
+JOYCONFIG_OBJ = tools/ssnes-joyconfig.o conf/config_file.o compat/strl.o
 HEADERS = $(wildcard */*.h) $(wildcard *.h)
 
 LIBS = -lm
diff --git a/Makefile.win b/Makefile.win
index 2379809542..cd36f40ad0 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,7 +1,7 @@
 TARGET = ssnes.exe
 JTARGET = ssnes-joyconfig.exe
-OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o bps.o ups.o strl.o screenshot.o getopt.o audio/utils.o posix_string.o
-JOBJ = conf/config_file.o tools/ssnes-joyconfig.o strl.o posix_string.o
+OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o bps.o ups.o compat/strl.o screenshot.o compat/getopt.o audio/utils.o compat/posix_string.o
+JOBJ = conf/config_file.o tools/ssnes-joyconfig.o compat/strl.o compat/posix_string.o
 
 CC = gcc
 CXX = g++
diff --git a/cheats.c b/cheats.c
index e961f4b79e..3c465ccc04 100644
--- a/cheats.c
+++ b/cheats.c
@@ -19,7 +19,7 @@
 #include "sha256.h"
 #include "dynamic.h"
 #include "general.h"
-#include "strl.h"
+#include "compat/strl.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/getopt.c b/compat/getopt.c
similarity index 100%
rename from getopt.c
rename to compat/getopt.c
diff --git a/getopt_ssnes.h b/compat/getopt_ssnes.h
similarity index 100%
rename from getopt_ssnes.h
rename to compat/getopt_ssnes.h
diff --git a/posix_string.c b/compat/posix_string.c
similarity index 100%
rename from posix_string.c
rename to compat/posix_string.c
diff --git a/posix_string.h b/compat/posix_string.h
similarity index 100%
rename from posix_string.h
rename to compat/posix_string.h
diff --git a/strl.c b/compat/strl.c
similarity index 100%
rename from strl.c
rename to compat/strl.c
diff --git a/strl.h b/compat/strl.h
similarity index 100%
rename from strl.h
rename to compat/strl.h
diff --git a/conf/config_file.c b/conf/config_file.c
index aa31f4740c..80dedcfda2 100644
--- a/conf/config_file.c
+++ b/conf/config_file.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include "../strl.h"
-#include "../posix_string.h"
+#include "../compat/strl.h"
+#include "../compat/posix_string.h"
 #include "../msvc/msvc_compat.h"
 
 #if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX)
diff --git a/console/console_ext.c b/console/console_ext.c
index c2f2c5861c..2bceb58568 100644
--- a/console/console_ext.c
+++ b/console/console_ext.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "../boolean.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 #include "../libsnes.hpp"
 #include "../general.h"
 #include <string.h>
diff --git a/console/main_wrap.c b/console/main_wrap.c
index 819c74c33a..cc1dba09dc 100644
--- a/console/main_wrap.c
+++ b/console/main_wrap.c
@@ -17,7 +17,7 @@
 
 #include "main_wrap.h"
 #include "../general.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/driver.c b/driver.c
index 04258d3b53..afecd5d2fa 100644
--- a/driver.c
+++ b/driver.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include "posix_string.h"
+#include "compat/posix_string.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/dynamic.c b/dynamic.c
index 626b134779..c4d6452169 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -17,7 +17,7 @@
 
 #include "dynamic.h"
 #include "general.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include <string.h>
 
 #ifdef SSNES_CONSOLE
diff --git a/file.c b/file.c
index 7810fef541..4747dcfcfe 100644
--- a/file.c
+++ b/file.c
@@ -26,7 +26,7 @@
 #include "movie.h"
 #include "ups.h"
 #include "bps.h"
-#include "strl.h"
+#include "compat/strl.h"
 
 #ifdef HAVE_XML
 #include "sha256.h"
diff --git a/general.h b/general.h
index 693dcd24c4..225f8e79bc 100644
--- a/general.h
+++ b/general.h
@@ -33,7 +33,7 @@
 #include "dynamic.h"
 #include "cheats.h"
 #include "audio/ext/ssnes_dsp.h"
-#include "strl.h"
+#include "compat/strl.h"
 
 #ifdef __CELLOS_LV2__
 #include <sys/timer.h>
diff --git a/gfx/gl.c b/gfx/gl.c
index 16b5cb5fe7..09eb016980 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -32,7 +32,7 @@
 #include "gl_common.h"
 #include "gfx_common.h"
 #include "sdlwrap.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 
 #define NO_SDL_GLEXT
 #include "SDL.h"
diff --git a/gfx/py_state/py_state.c b/gfx/py_state/py_state.c
index aa845a0ef4..09067eeb5e 100644
--- a/gfx/py_state/py_state.c
+++ b/gfx/py_state/py_state.c
@@ -25,8 +25,8 @@
 #include "../../libsnes.hpp"
 #include "py_state.h"
 #include "../../general.h"
-#include "../../strl.h"
-#include "../../posix_string.h"
+#include "../../compat/strl.h"
+#include "../../compat/posix_string.h"
 #include "../../file.h"
 
 #define PY_READ_FUNC_DECL(RAMTYPE) py_read_##RAMTYPE
diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c
index ecc70afb3e..55f3c3c6de 100644
--- a/gfx/shader_glsl.c
+++ b/gfx/shader_glsl.c
@@ -19,8 +19,8 @@
 #include <string.h>
 #include "../general.h"
 #include "shader_glsl.h"
-#include "../strl.h"
-#include "../posix_string.h"
+#include "../compat/strl.h"
+#include "../compat/posix_string.h"
 #include "snes_state.h"
 #include "../dynamic.h"
 
diff --git a/gfx/snes_state.c b/gfx/snes_state.c
index abaee99efa..49d48634a0 100644
--- a/gfx/snes_state.c
+++ b/gfx/snes_state.c
@@ -17,7 +17,7 @@
 
 #include "snes_state.h"
 #include <stdlib.h>
-#include "../strl.h"
+#include "../compat/strl.h"
 #include "../general.h"
 #include "../libsnes.hpp"
 
diff --git a/input/input_luts.c b/input/input_luts.c
index d09b0a6878..3750efc8c2 100644
--- a/input/input_luts.c
+++ b/input/input_luts.c
@@ -25,7 +25,7 @@
 #include <stddef.h>
 #include <string.h>
 #include "input_luts.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 
 uint64_t ssnes_default_keybind_lut[SSNES_FIRST_META_KEY];
 
diff --git a/message.c b/message.c
index 4ef385e01b..24066198d7 100644
--- a/message.c
+++ b/message.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "boolean.h"
-#include "posix_string.h"
+#include "compat/posix_string.h"
 
 struct queue_elem
 {
diff --git a/screenshot.c b/screenshot.c
index 9aeadd4131..ec58ba8d4c 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -16,7 +16,7 @@
  */
 
 #include "screenshot.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include <stdio.h>
 #include <time.h>
 #include "boolean.h"
diff --git a/settings.c b/settings.c
index d05c018343..479b362dcb 100644
--- a/settings.c
+++ b/settings.c
@@ -19,10 +19,10 @@
 #include "conf/config_file.h"
 #include "conf/config_file_macros.h"
 #include "input/keysym.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include "config.def.h"
 #include "file.h"
-#include "posix_string.h"
+#include "compat/posix_string.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ssnes.c b/ssnes.c
index 788f36dd1f..64183133b4 100644
--- a/ssnes.c
+++ b/ssnes.c
@@ -30,10 +30,10 @@
 #include "record/ffemu.h"
 #include "rewind.h"
 #include "movie.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include "screenshot.h"
 #include "cheats.h"
-#include "getopt_ssnes.h"
+#include "compat/getopt_ssnes.h"
 
 #if defined(_WIN32) && !defined(_XBOX)
 #define WIN32_LEAN_AND_MEAN
diff --git a/tools/ssnes-joyconfig.c b/tools/ssnes-joyconfig.c
index 6dae98f0f1..7b26a79e5a 100644
--- a/tools/ssnes-joyconfig.c
+++ b/tools/ssnes-joyconfig.c
@@ -30,7 +30,7 @@
 #include "../boolean.h"
 #include "general.h"
 #include <assert.h>
-#include "../posix_string.h"
+#include "../compat/posix_string.h"
 
 static int g_player = 1;
 static int g_joypad = 0;