diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index e1b48c3e77d..83c8c39b749 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -16,23 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 92d4fa2826d..23f665dd019 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -16,21 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 5ee8df8cb54..13a3b0a0838 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 0a020848f7e..41ee6176052 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index ca909127703..874c881e513 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index b921293b141..7b528adb8e2 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index fa759ebe254..9617aedf2f3 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -22,21 +22,10 @@ * - Handle redirects as native. */ -#include - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" -#include "wininet.h" #include "urlmon_main.h" +#include "wininet.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 26269823610..66939df2ff0 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -16,21 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" +#include "urlmon_main.h" #include "winreg.h" #include "shlwapi.h" -#include "ole2.h" -#include "urlmon.h" -#include "urlmon_main.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 031224a93e6..9476ec0c560 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -16,19 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index c4c4188834b..76e06ab7777 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -18,26 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include -#include - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winreg.h" -#include "winerror.h" -#include "advpub.h" - -#include "objbase.h" - -#include "urlmon.h" - -#include "wine/debug.h" #include "urlmon_main.h" +#include "winreg.h" +#include "advpub.h" + +#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); /* diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 83c21832d91..0b56ba4e700 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -19,20 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "wine/debug.h" -#include "ole2.h" -#include "wine/unicode.h" -#include "urlmon.h" #include "urlmon_main.h" +#include "winreg.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 5c24aecec7c..044b3ea690a 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -16,20 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" +#include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index e8aae03f98b..395464126f0 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -20,26 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT +#include "urlmon_main.h" -#include "windef.h" -#include "winbase.h" #include "winreg.h" #include "winternl.h" -#include "winuser.h" -#include "objbase.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "ole2.h" -#include "urlmon.h" #include "wininet.h" #include "shlwapi.h" -#include "urlmon_main.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index b70a2cd4701..54037354ea5 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -19,23 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "urlmon_main.h" -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" #include "winreg.h" #include "winternl.h" -#include "winuser.h" -#include "objbase.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "ole2.h" -#include "urlmon.h" #include "wininet.h" #include "shlwapi.h" -#include "urlmon_main.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 10d3d9587d7..1661bb66c2d 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -20,21 +20,15 @@ #include -#define COBJMACROS +#include "urlmon_main.h" -#include "windef.h" -#include "winbase.h" #include "winreg.h" #define NO_SHLWAPI_REG #include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" -#include "winuser.h" #include "urlmon.h" -#include "urlmon_main.h" -#include "ole2.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 8803ffc80be..631b60bc530 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -21,8 +21,15 @@ #include +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "urlmon.h" #include "wine/unicode.h"