diff --git a/include/wine/port.h b/include/wine/port.h
index b1354395ca9..9c2eb7277bf 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -165,8 +165,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
  * Function definitions (only when using libwine_port)
  */
 
-#ifndef NO_LIBWINE_PORT
-
 #ifndef HAVE_GETOPT_LONG_ONLY
 extern char *optarg;
 extern int optind;
@@ -230,16 +228,4 @@ int symlink(const char *from, const char *to);
 
 extern int mkstemps(char *template, int suffix_len);
 
-#else /* NO_LIBWINE_PORT */
-
-#define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable
-
-#define getopt_long             __WINE_NOT_PORTABLE(getopt_long)
-#define getopt_long_only        __WINE_NOT_PORTABLE(getopt_long_only)
-#define lstat                   __WINE_NOT_PORTABLE(lstat)
-#define pread                   __WINE_NOT_PORTABLE(pread)
-#define pwrite                  __WINE_NOT_PORTABLE(pwrite)
-
-#endif /* NO_LIBWINE_PORT */
-
 #endif /* !defined(__WINE_WINE_PORT_H) */
diff --git a/tools/makedep.c b/tools/makedep.c
index cee64fd61bf..f769713a8cf 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -19,20 +19,26 @@
  */
 
 #include "config.h"
-#define NO_LIBWINE_PORT
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <signal.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <direct.h>
+#include <io.h>
+#define mkdir(path,mode) mkdir(path)
+#endif
 #include "wine/list.h"
 
 struct strarray