diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index b54a3a1617f..a3da072d158 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -10,7 +10,7 @@
 #
 
 DLLFLAGS    = @DLLFLAGS@
-DEFS        = -DWINE_STRICT_PROTOTYPES -DWINE_NO_UNICODE_MACROS $(EXTRADEFS)
+DEFS        = -D__WINESRC__ $(EXTRADEFS)
 ALL_LIBS    = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
 INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
 
diff --git a/programs/clock/main.c b/programs/clock/main.c
index bbbb69121b5..048b1aac0e4 100644
--- a/programs/clock/main.c
+++ b/programs/clock/main.c
@@ -27,6 +27,7 @@
 
 #include "windows.h"
 #include "commdlg.h"
+#include "shellapi.h"
 
 #include "main.h"
 #include "winclock.h"
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 6330ef6bbb8..aad4b0936c9 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -26,7 +26,9 @@
  */
 
 #include "config.h"
+#include <time.h>
 #include "wcmd.h"
+#include "shellapi.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cmd);
diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c
index ca3698e9d23..329ef472e69 100644
--- a/programs/explorer/appbar.c
+++ b/programs/explorer/appbar.c
@@ -27,10 +27,10 @@
  * TODO: multiple monitor support
  */
 
+#include "windows.h"
+#include "shellapi.h"
 #include "wine/unicode.h"
-
-#include <windows.h>
-#include <wine/debug.h>
+#include "wine/debug.h"
 #include "explorer_private.h"
 
 #include "wine/list.h"
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index bf04d4f7e89..84f6fa318ec 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -26,6 +26,7 @@
 #define OEMRESOURCE
 
 #include <windows.h>
+#include <rpc.h>
 #include <wine/debug.h>
 #include "explorer_private.h"
 
diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c
index 35080a3ca1a..aa7303d6463 100644
--- a/programs/explorer/explorer.c
+++ b/programs/explorer/explorer.c
@@ -30,6 +30,7 @@
 
 #include <initguid.h>
 #include <windows.h>
+#include <shellapi.h>
 #include <shobjidl.h>
 #include <shlobj.h>
 #include <shlwapi.h>
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 93793ab2e41..716335cb7c5 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -24,6 +24,7 @@
 #define _WIN32_IE 0x500
 #include <windows.h>
 #include <commctrl.h>
+#include <shellapi.h>
 
 #include <wine/debug.h>
 #include <wine/list.h>
diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c
index 23a738f8916..73fec2567fb 100644
--- a/programs/iexplore/main.c
+++ b/programs/iexplore/main.c
@@ -20,6 +20,7 @@
 
 #include <windows.h>
 #include <advpub.h>
+#include <ole2.h>
 #include <rpcproxy.h>
 
 #include "wine/unicode.h"
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index b794557cc28..4542f34dbd4 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -23,6 +23,7 @@
 
 #include <windows.h>
 #include <msi.h>
+#include <winsvc.h>
 #include <objbase.h>
 #include <stdio.h>
 
diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c
index 3ccdb5bb58b..ab419ca0f61 100644
--- a/programs/msiexec/service.c
+++ b/programs/msiexec/service.c
@@ -20,8 +20,9 @@
 
 #define WIN32_LEAN_AND_MEAN
 
-#include <windows.h>
 #include <stdio.h>
+#include <windows.h>
+#include <winsvc.h>
 
 #include "wine/debug.h"
 
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index ec30a8f84ff..5878da8eada 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <windows.h>
+#include <shellapi.h>
 #include <commdlg.h>
 #include <shlwapi.h>
 #include <winternl.h>
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 91480648cbe..235981fd1e5 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -22,9 +22,11 @@
  *
  */
 
-#include <windows.h>
-#include <shlwapi.h>
 #include <stdio.h>
+#include <windows.h>
+#include <commdlg.h>
+#include <shellapi.h>
+#include <shlwapi.h>
 
 #include "main.h"
 #include "dialog.h"
diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c
index 7901d606ae5..9ceaa49f603 100644
--- a/programs/oleview/oleview.c
+++ b/programs/oleview/oleview.c
@@ -19,6 +19,8 @@
  */
 
 #include "main.h"
+#include "commdlg.h"
+#include "shellapi.h"
 #include "wine/unicode.h"
 
 GLOBALS globals;
diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c
index 21e9d963a4a..c6aec5f8873 100644
--- a/programs/oleview/typelib.c
+++ b/programs/oleview/typelib.c
@@ -19,6 +19,7 @@
  */
 
 #include "main.h"
+#include "commdlg.h"
 
 #include "wine/debug.h"
 #include "wine/unicode.h"
diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c
index cbf01d5bf43..ea8e078ee74 100644
--- a/programs/plugplay/main.c
+++ b/programs/plugplay/main.c
@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include "winsvc.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c
index b17a1770ee8..de5e323b7b3 100644
--- a/programs/presentationfontcache/main.c
+++ b/programs/presentationfontcache/main.c
@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include "winsvc.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(fontcache);
diff --git a/programs/progman/main.c b/programs/progman/main.c
index be67ace37d4..49a7bf7e90c 100644
--- a/programs/progman/main.c
+++ b/programs/progman/main.c
@@ -25,6 +25,7 @@
 #define OEMRESOURCE
 
 #include "windows.h"
+#include "shellapi.h"
 #include "progman.h"
 
 GLOBALS Globals;
diff --git a/programs/sc/sc.c b/programs/sc/sc.c
index e4df09affbd..2cfe91c633e 100644
--- a/programs/sc/sc.c
+++ b/programs/sc/sc.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <windows.h>
+#include <winsvc.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(sc);
 
diff --git a/programs/services/utils.c b/programs/services/utils.c
index 191cc5f07e5..920b6daf6ac 100644
--- a/programs/services/utils.c
+++ b/programs/services/utils.c
@@ -22,6 +22,7 @@
 
 #include <stdarg.h>
 #include <windows.h>
+#include <winsvc.h>
 
 #include "wine/unicode.h"
 #include "wine/debug.h"
diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c
index 10a227ff0f1..169b80233b7 100644
--- a/programs/spoolsv/main.c
+++ b/programs/spoolsv/main.c
@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include <winsvc.h>
 
 #include "wine/debug.h"
 
diff --git a/programs/start/start.c b/programs/start/start.c
index fe0ac1c72ae..3fb189b5832 100644
--- a/programs/start/start.c
+++ b/programs/start/start.c
@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
-#include <winuser.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <windows.h>
 #include <shlobj.h>
+#include <shellapi.h>
 
 #include <wine/unicode.h>
 #include <wine/debug.h>
diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c
index 7be0123102c..4408edaa635 100644
--- a/programs/taskkill/taskkill.c
+++ b/programs/taskkill/taskkill.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdlib.h>
 #include <windows.h>
 #include <psapi.h>
 #include <wine/unicode.h>
diff --git a/programs/termsv/main.c b/programs/termsv/main.c
index 6391525efb1..de903501eb0 100644
--- a/programs/termsv/main.c
+++ b/programs/termsv/main.c
@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include <winsvc.h>
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(termsv);
diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c
index 9e94fd5cb22..ad46b206e7d 100644
--- a/programs/winebrowser/main.c
+++ b/programs/winebrowser/main.c
@@ -45,6 +45,7 @@
 
 #include <windows.h>
 #include <shlwapi.h>
+#include <urlmon.h>
 #include <ddeml.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index cf284c939fc..98faf51d6d3 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -41,6 +41,8 @@
 #define COBJMACROS
 
 #include <windows.h>
+#include <commdlg.h>
+#include <shellapi.h>
 #include <uxtheme.h>
 #include <tmschema.h>
 #include <shlobj.h>
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index 1f68d8d84c5..4461c73d459 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -55,6 +55,8 @@
 
 #include "wine/library.h"
 #include "wine/debug.h"
+#undef ERR
+#define ERR (-1)
 
 WINE_DEFAULT_DEBUG_CHANNEL(curses);
 
diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y
index fa5e9a70a48..26f4a79248c 100644
--- a/programs/winedbg/dbg.y
+++ b/programs/winedbg/dbg.y
@@ -27,9 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include "debugger.h"
 #include "wine/exception.h"
diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l
index dfb75b46afb..a12b6377448 100644
--- a/programs/winedbg/debug.l
+++ b/programs/winedbg/debug.l
@@ -27,10 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifndef HAVE_UNISTD_H
 #define YY_NO_UNISTD_H
-#endif
-
 #include "debugger.h"
 #include "dbg.tab.h"
 
diff --git a/programs/winetest/send.c b/programs/winetest/send.c
index 4a3cc7d228a..7767d251895 100644
--- a/programs/winetest/send.c
+++ b/programs/winetest/send.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <winsock.h>
+#include <winsock2.h>
 #include <wininet.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
index f2780ee1ebb..abc04d3ce09 100644
--- a/programs/winhlp32/macro.lex.l
+++ b/programs/winhlp32/macro.lex.l
@@ -27,10 +27,7 @@
 #include <assert.h>
 #include <stdarg.h>
 
-#ifndef HAVE_UNISTD_H
 #define YY_NO_UNISTD_H
-#endif
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
diff --git a/programs/winver/winver.c b/programs/winver/winver.c
index acb5d61d867..8d725ac73b0 100644
--- a/programs/winver/winver.c
+++ b/programs/winver/winver.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "windows.h"
+#include "shellapi.h"
 
 int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c
index 12132990e07..eb48e48e5e7 100644
--- a/programs/wordpad/print.c
+++ b/programs/wordpad/print.c
@@ -21,6 +21,7 @@
 #include <windows.h>
 #include <richedit.h>
 #include <commctrl.h>
+#include <commdlg.h>
 
 #include "wordpad.h"
 
diff --git a/programs/wscript/main.c b/programs/wscript/main.c
index 9d79415e490..d456e98ad8f 100644
--- a/programs/wscript/main.c
+++ b/programs/wscript/main.c
@@ -24,6 +24,7 @@
 #include <winbase.h>
 #include <winreg.h>
 #include <ole2.h>
+#include <shellapi.h>
 #include <activscp.h>
 #include <initguid.h>
 
diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index 03eb8996936..604c07aec4a 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -41,6 +41,7 @@
 
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <windows.h>
 #include <wine/debug.h>
 #include <wine/unicode.h>