From 56da0c33fb24b65e309b757e3170253ca0e92940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20B=C3=A9ron?= Date: Wed, 10 Aug 2005 09:51:40 +0000 Subject: [PATCH] Use #include "foo.h" for including Windows headers in dlls/, use #include for including Windows headers in include/. --- dlls/usp10/usp10.c | 8 ++++---- include/msacmdrv.h | 10 +++++----- include/msi.h | 2 +- include/msxml.idl | 2 +- include/msxml2.idl | 4 ++-- include/odbcinst.h | 2 +- include/strmif.idl | 8 ++++---- include/xmldom.idl | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 752951ef7ae..8511e6945f6 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -24,10 +24,10 @@ #include -#include -#include -#include -#include +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "usp10.h" #include "wine/debug.h" diff --git a/include/msacmdrv.h b/include/msacmdrv.h index 6d2668dface..fa9317ac0c3 100644 --- a/include/msacmdrv.h +++ b/include/msacmdrv.h @@ -23,11 +23,11 @@ #include -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" +#include +#include +#include +#include +#include /*********************************************************************** * Types diff --git a/include/msi.h b/include/msi.h index 38e37251f99..7dfb69e3fbe 100644 --- a/include/msi.h +++ b/include/msi.h @@ -24,7 +24,7 @@ extern "C" { #endif #ifndef _MSI_NO_CRYPTO -#include "wincrypt.h" +#include #endif typedef unsigned long MSIHANDLE; diff --git a/include/msxml.idl b/include/msxml.idl index 328d8aa2d6f..5f20f98ed7d 100644 --- a/include/msxml.idl +++ b/include/msxml.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "msxmldid.h" +#include import "unknwn.idl"; import "wtypes.idl"; diff --git a/include/msxml2.idl b/include/msxml2.idl index 9403dd7a725..5e7255a395f 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "msxml2did.h" -#include "olectl.h" +#include +#include import "unknwn.idl"; import "objidl.idl"; diff --git a/include/odbcinst.h b/include/odbcinst.h index bee34cffc7b..569a0edb9ec 100644 --- a/include/odbcinst.h +++ b/include/odbcinst.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include "sql.h" +#include /* flags for Installer function requests */ #define ODBC_INSTALL_INQUIRY 1 diff --git a/include/strmif.idl b/include/strmif.idl index c2ef913c8a5..fd40f5fb8ce 100644 --- a/include/strmif.idl +++ b/include/strmif.idl @@ -18,10 +18,10 @@ import "objidl.idl"; -#include "devenum.idl" +#include -#include "axcore.idl" +#include -#include "axextend.idl" +#include -#include "dyngraph.idl" +#include diff --git a/include/xmldom.idl b/include/xmldom.idl index 47321f78ab0..86dcd1b53ff 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "xmldomdid.h" -#include "idispids.h" +#include +#include import "ocidl.idl";