diff --git a/include/wceconf.h b/include/wceconf.h
index ed884dd9d..ebd0c4ceb 100644
--- a/include/wceconf.h
+++ b/include/wceconf.h
@@ -43,6 +43,8 @@
 
 #define USER_SOUNDS
 
+#define AUTOPICKUP_EXCEPTIONS
+
 /*
  * -----------------------------------------------------------------
  *  The remaining code shouldn't need modification.
@@ -348,4 +350,11 @@ extern long   __cdecl ftell(FILE * f);
 # undef ARM
 # endif
 
+/* leave - Windows CE defines leave as part of exception handling (__leave)
+   It confilicts with existing sources and since we don't use exceptions it is safe 
+   to undefine it */
+# ifdef leave
+# undef leave
+# endif
+
 #endif /* WCECONF_H */