diff --git a/firmware/SOURCES b/firmware/SOURCES
index dbfa102ceb..b70ee7f118 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -139,7 +139,7 @@ mp3data.c
 #if CONFIG_CODEC != SWCODEC
 mpeg.c
 #endif
-#ifndef WIN32 /* the win32 sim has its own versin of these: */
+#if !defined(WIN32) || defined(SDL)
 panic.c
 debug.c
 #endif
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 7fcae6edf1..2779bd9c95 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -29,7 +29,9 @@
 
 #ifdef SIMULATOR
 #define lcd_icon(x,y) sim_lcd_icon(x,y)
+#ifndef MAX_PATH
 #define MAX_PATH 260
+#endif
 #else
 #include "file.h"  /* for MAX_PATH; FIXME: Why does this not work for sims? */
 #endif
diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c
index 68eb8933a5..4943bc04e2 100644
--- a/uisimulator/common/io.c
+++ b/uisimulator/common/io.c
@@ -409,7 +409,7 @@ void sim_plugin_close(int pd)
     dlclose((void *)pd);
 }
 
-#ifndef WIN32
+#if !defined(WIN32) || defined(SDL)
 /* the win32 version is in debug-win32.c */
 
 void debug_init(void)
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c
index a9fc294b1a..119c440318 100644
--- a/uisimulator/common/lcd-common.c
+++ b/uisimulator/common/lcd-common.c
@@ -24,7 +24,7 @@
 
 #include "lcd.h"
 
-#ifdef WIN32 
+#if defined(WIN32) && !defined(SDL)
 #include "lcd-win32.h"
 #else
 #include "lcd-x11.h"