diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index d72938b6c1..4736f31e76 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -26,9 +26,11 @@
 #include "checkwps.h"
 #include "resize.h"
 #include "wps.h"
+#include "skin_engine.h"
 #include "wps_internals.h"
 #include "settings.h"
 #include "viewport.h"
+#include "file.h"
 
 bool debug_wps = true;
 int wps_verbose_level = 0;
@@ -313,7 +315,6 @@ int main(int argc, char **argv)
     int filearg = 1;
 
     struct wps_data wps;
-    struct screen* wps_screen = &screens[SCREEN_MAIN];
 
     /* No arguments -> print the help text
      * Also print the help text upon -h or --help */
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index b28d8e8411..13fef935dd 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -7,7 +7,7 @@
 # $Id$
 #
 
-FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET)
+FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET) -Wall
 
 SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES)
 
diff --git a/tools/checkwps/file.h b/tools/checkwps/file.h
index 4256c1ee37..a14d7f5b91 100644
--- a/tools/checkwps/file.h
+++ b/tools/checkwps/file.h
@@ -5,3 +5,12 @@
 /* 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);