diff --git a/include/config.h.w32 b/include/config.h.w32
index ea338f26b..6e356f355 100644
--- a/include/config.h.w32
+++ b/include/config.h.w32
@@ -1356,11 +1356,15 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define if you don't want to use mmap. */
 #define NO_MMAP 1
 
+/* Define if EGD rand method is not defined */
 #define NO_RAND_EGD_METHOD 1
 
 /* Define if the Unix rand method is not defined */
 #define NO_RAND_UNIX_METHOD 1
 
+/* Define if the Fortuna rand method is not defined */
+#define NO_RAND_FORTUNA_METHOD 1
+
 /* Define if PID files should not be used. */
 #define NO_PIDFILES 1
 
@@ -1454,32 +1458,6 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #include "roken_rename.h"
 #endif
 
-#define RETSIGTYPE void
-
-#define VOID_RETSIGTYPE 1
-
-#ifdef VOID_RETSIGTYPE
-#define SIGRETURN(x) return
-#else
-#define SIGRETURN(x) return (RETSIGTYPE)(x)
-#endif
-
-#ifndef CPP_ONLY
-
-typedef int pid_t;
-
-typedef unsigned int gid_t;
-
-typedef unsigned int uid_t;
-
-typedef unsigned short mode_t;
-
-#endif
-
-#ifndef __cplusplus
-#define inline __inline
-#endif
-
 #if defined(ENCRYPTION) && !defined(AUTHENTICATION)
 #define AUTHENTICATION 1
 #endif