diff --git a/file_extract.c b/file_extract.c
index f1bd673749..e823f83518 100644
--- a/file_extract.c
+++ b/file_extract.c
@@ -29,6 +29,7 @@
 
 // Modified from nall::unzip (higan).
 
+#undef GOTO_END_ERROR
 #define GOTO_END_ERROR() do { \
    RARCH_ERR("ZIP extraction failed at line: %d.\n", __LINE__); \
    ret = false; \
diff --git a/gfx/rpng/rpng.c b/gfx/rpng/rpng.c
index 7fa1e2fa9f..4040eb3531 100644
--- a/gfx/rpng/rpng.c
+++ b/gfx/rpng/rpng.c
@@ -31,6 +31,7 @@
 //
 // Missing: Adam7 interlace, 16 bpp, various color formats.
 
+#undef GOTO_END_ERROR
 #define GOTO_END_ERROR() do { \
    fprintf(stderr, "[RPNG]: Error in line %d.\n", __LINE__); \
    ret = false; \