3 files changed, 16 insertions, 21 deletions

diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES
index 828b7965ea..425e8de7b9 100644
--- a/tools/checkwps/SOURCES
+++ b/tools/checkwps/SOURCES
@@ -1,13 +1,21 @@
+#undef unix /* messes up filesystem-unix.c below */
 ../../apps/gui/skin_engine/skin_parser.c
 ../../apps/gui/skin_engine/skin_backdrops.c
 ../../apps/gui/viewport.c
 ../../apps/misc.c
 ../../firmware/common/strlcpy.c
-checkwps.c
-
+../../firmware/common/pathfuncs.c
+../../firmware/asm/mempcpy.c
+../../firmware/target/hosted/filesystem-unix.c
 #ifdef APPLICATION
-../../firmware/common/rbpaths.c
+../../firmware/target/hosted/filesystem-app.c
+#else
+../../uisimulator/common/filesystem-sim.c
 #endif
+#ifdef DEBUG
+../../firmware/debug.c
+#endif
+checkwps.c
 
 #ifdef HAVE_LCD_BITMAP
 ../../apps/recorder/bmp.c
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index 10e505f006..c2cadc7444 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -39,11 +39,14 @@ bool debug_wps = true;
 int wps_verbose_level = 0;
 char *skin_buffer;
 
-int errno;
-
+const char *sim_root_dir = ".";
 const struct settings_list *settings;
 const int nb_settings = 0;
 
+#ifdef SIMULATOR
+#error beep beep
+#endif
+
 /* static endianness conversion */
 #define SWAP_16(x) ((typeof(x))(unsigned short)(((unsigned short)(x) >> 8) | \
                                                 ((unsigned short)(x) << 8)))
diff --git a/tools/checkwps/file.h b/tools/checkwps/file.h
deleted file mode 100644
index a14d7f5b91..0000000000
--- a/tools/checkwps/file.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MAX_PATH
-#define MAX_PATH 260
-#endif
-
-/* Wrapper - required for O_RDONLY */
-
-#include <fcntl.h>
-
-extern ssize_t read(int fd, void *buf, size_t count);
-extern ssize_t write(int fd, const void *buf, size_t count);
-extern off_t lseek(int fildes, off_t offset, int whence);
-extern int close(int fd);
-
-/* strlcpy doesn't belong here (it's in string.h in the rockbox sources),
- * but this avoids complicated magic to override the system string.h */
-size_t  strlcpy(char *dst, const char *src, size_t siz);