diff --git a/Makefile.in b/Makefile.in
index 0c50eb45ed8..23416590a5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,14 +105,14 @@ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
 
 all: $(SUBDIRS)
 dlls: libs tools
-server: libs tools
-miscemu programs: dlls libs tools
+miscemu server: libs tools
+programs: dlls libs tools
 tools: libs
 
 dlls/__install-lib__ dlls/__install-dev__: libs tools
 libs/__install-lib__ libs/__install-dev__: libs
-server/__install__: libs tools
-miscemu/__install__ programs/__install__: libs tools dlls/__install-lib__
+miscemu/__install__ server/__install__: libs tools
+programs/__install__: libs tools dlls/__install-lib__
 tools/__install__: tools
 
 # Test rules
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 5b5671263ed..833e81ee3a9 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -1525,26 +1525,6 @@ wow32/wow32.dll$(DLLEXT): wow32
 winsock/ws2_32.dll$(DLLEXT): winsock
 wsock32/wsock32.dll$(DLLEXT): wsock32
 x11drv/x11drv.dll$(DLLEXT): x11drv
-
-# Special targets for dlls that we need to link to
-
-libntdll.dll.$(LIBEXT): ntdll/ntdll.dll$(DLLEXT)
-	$(RM) $@ && $(LN_S) ntdll/ntdll.dll$(DLLEXT) $@
-
-all: libntdll.dll.$(LIBEXT)
-
-uninstall::
-	$(RM) $(libdir)/libntdll.dll.$(LIBEXT)
-
-install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
-	cd $(libdir) && $(RM) libntdll.dll.$(LIBEXT) && \
-	if [ "$(dlldir)" = "$(libdir)/wine" ]; \
-	then \
-	  $(LN_S) wine/ntdll.dll$(DLLEXT) libntdll.dll.$(LIBEXT); \
-	else \
-	  $(LN_S) $(dlldir)/ntdll.dll$(DLLEXT) libntdll.dll.$(LIBEXT); \
-	fi
-
 # Rules for auto documentation
 
 $(SUBDIRS:%=%/__man__): dummy
@@ -1570,6 +1550,8 @@ install install-dev:: $(IMPORT_LIBS:%=%.$(IMPLIBEXT))
 	$(MKINSTALLDIRS) $(dlldir)
 	for f in $(IMPORT_LIBS:%=%.$(IMPLIBEXT)); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done
 
+install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
+
 uninstall::
 	$(RM) $(IMPORT_LIBS:%=$(dlldir)/%.$(IMPLIBEXT))
 	-rmdir $(dlldir)
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 024b3f3f616..6c3c01a9991 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -256,32 +256,6 @@ foreach my $mod (sort keys %directories)
     printf NEWMAKE "%s/%s\$(DLLEXT): %s\n", $directories{$mod}, $mod, $directories{$mod};
 }
 
-################################################################
-# output the linkable dlls special links
-
-print NEWMAKE <<EOF;
-
-\# Special targets for dlls that we need to link to
-
-libntdll.dll.\$(LIBEXT): ntdll/ntdll.dll\$(DLLEXT)
-	\$(RM) \$@ && \$(LN_S) ntdll/ntdll.dll\$(DLLEXT) \$@
-
-all: libntdll.dll.\$(LIBEXT)
-
-uninstall::
-	\$(RM) \$(libdir)/libntdll.dll.\$(LIBEXT)
-
-install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__)
-	cd \$(libdir) && \$(RM) libntdll.dll.\$(LIBEXT) && \\
-	if [ "\$(dlldir)" = "\$(libdir)/wine" ]; \\
-	then \\
-	  \$(LN_S) wine/ntdll.dll\$(DLLEXT) libntdll.dll.\$(LIBEXT); \\
-	else \\
-	  \$(LN_S) \$(dlldir)/ntdll.dll\$(DLLEXT) libntdll.dll.\$(LIBEXT); \\
-	fi
-
-EOF
-
 ################################################################
 # makefile trailer
 
@@ -311,6 +285,8 @@ install install-dev:: \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT))
 	\$(MKINSTALLDIRS) \$(dlldir)
 	for f in \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT)); do \$(INSTALL_DATA) \$\$f \$(dlldir)/\$\$f; done
 
+install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__)
+
 uninstall::
 	\$(RM) \$(IMPORT_LIBS:%=\$(dlldir)/%.\$(IMPLIBEXT))
 	-rmdir \$(dlldir)
diff --git a/tools/winewrapper b/tools/winewrapper
index 1ac2dd65551..e70972759c1 100755
--- a/tools/winewrapper
+++ b/tools/winewrapper
@@ -64,9 +64,9 @@ topdir=`cd "$topdir" && pwd`
 
 if [ -n "$LD_LIBRARY_PATH" ]
 then
-  LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs:$LD_LIBRARY_PATH"
+  LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH"
 else
-  LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs"
+  LD_LIBRARY_PATH="$topdir/libs"
 fi
 WINEDLLPATH="$topdir/dlls:$topdir/programs"
 WINESERVER="$topdir/server/wineserver"