diff --git a/include/winsock.h b/include/winsock.h
index 304b23ef466..5f8aa343de0 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -375,6 +375,8 @@ extern "C" {
 
 /* Microsoft Windows Extension function prototypes */
 
+int     WINAPI closesocket(SOCKET s);
+
 INT     WINAPI WSAStartup(UINT wVersionRequired, LPWSADATA lpWSAData);
 void      WINAPI WSASetLastError(INT iError);
 INT     WINAPI WSACleanup(void);
diff --git a/tools/winemaker b/tools/winemaker
index aaffe0fd7bd..65fd8a2f7f7 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -1404,8 +1404,10 @@ sub generate_spec_file
     return;
   }
 
-  my $canon=canonize($basename);
-  print FILEO "name    $canon\n";
+  my $module=$basename;
+  $module =~ s+^lib++;
+  $module=canonize($module);
+  print FILEO "name    $module\n";
   print FILEO "type    win32\n";
   if (@$target[$T_TYPE] == $TT_GUIEXE) {
     print FILEO "mode    guiexe\n";
@@ -2793,7 +2795,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
 	-cd `dirname $@` && $(RM) $(CLEAN_FILES)
 
 clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
-	$(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(OBJS) $(EXES) $(EXES:%=%.so) $(DLLS)
+	$(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(OBJS) $(SPEC_SRCS:.spec=.tmp.o) $(EXES) $(EXES:%=%.so) $(DLLS)
 
 # Rules for installing