diff --git a/firmware/include/sys/types.h b/firmware/include/sys/types.h
index 7bca33b78d..e96f651ed0 100644
--- a/firmware/include/sys/types.h
+++ b/firmware/include/sys/types.h
@@ -20,29 +20,30 @@
 #ifndef _SYS_TYPES_H_
 #define _SYS_TYPES_H_
 
-#if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t)
+#if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) && !defined(_SSIZE_T_DECLARED)
 #define __ssize_t_defined
 #define _SSIZE_T_
 #define ssize_t ssize_t
 typedef signed long ssize_t;
 #endif
 
-#if !defined(__off_t_defined) && !defined(_OFF_T_) && !defined(off_t)
+#if !defined(__off_t_defined) && !defined(_OFF_T_) && !defined(off_t) && !defined(_OFF_T_DECLARED)
 #define __off_t_defined
 #define _OFF_T_
 #define off_t off_t
 typedef signed long off_t;
 #endif
 
-#if !defined(__mode_t_defined) && !defined(_MODE_T_) && !defined(mode_t)
+#if !defined(__mode_t_defined) && !defined(_MODE_T_) && !defined(mode_t) && !defined(_MODE_T_DECLARED)
 #define __mode_t_defined
 #define _MODE_T_
 #define mode_t mode_t
 typedef unsigned int mode_t;
 #endif
 
-#ifndef _SIZE_T
+#if !defined(_SIZE_T) && !defined(_SIZE_T_DECLARED)
 #define _SIZE_T
+#define _SIZE_T_DECLARED
 typedef unsigned long size_t;
 #endif
 
diff --git a/firmware/include/time.h b/firmware/include/time.h
index 734344f810..cddec1e708 100644
--- a/firmware/include/time.h
+++ b/firmware/include/time.h
@@ -20,13 +20,14 @@ struct tm
   int	tm_isdst;
 };
 
-#if defined(SIMULATOR) && !defined(_TIME_T_DEFINED)
+#if defined(SIMULATOR) && !defined(_TIME_T_DEFINED) && !defined(_TIME_T_DECLARED)
 /* for non-win32 simulators */
 typedef long time_t;
 
 /* this define below is used by the mingw headers to prevent duplicate
    typedefs */
 #define _TIME_T_DEFINED
+#define _TIME_T_DECLARED
 time_t time(time_t *t);
 struct tm *localtime(const time_t *timep);
 
diff --git a/tools/configure b/tools/configure
index d008308a88..dd84525eb4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1235,7 +1235,7 @@ if [ "yes" = "$simulator" ]; then
 
 install:
 	@echo "installing a full setup in your archos dir"
-	@(make zip && cd archos && unzip -oq ../rockbox.zip)
+	@(\$(MAKE) zip && cd archos && unzip -oq ../rockbox.zip)
 EOF
 
 fi