MSHTML: Move includes of interfaces to mshtml_pricate.h

[cjacek]

This way I won't have to change each file to add new interface.

Changelog:
    Move includes of interfaces to mshtml_pricate.h
-------------- next part --------------
Index: dlls/mshtml/htmldoc.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/htmldoc.c,v
retrieving revision 1.15
diff -u -p -r1.15 htmldoc.c
--- dlls/mshtml/htmldoc.c	8 Aug 2005 11:07:48 -0000	1.15
+++ dlls/mshtml/htmldoc.c	10 Aug 2005 10:17:17 -0000
@@ -27,10 +27,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"
 
Index: dlls/mshtml/main.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/main.c,v
retrieving revision 1.20
diff -u -p -r1.20 main.c
--- dlls/mshtml/main.c	10 Aug 2005 09:53:47 -0000	1.20
+++ dlls/mshtml/main.c	10 Aug 2005 10:17:17 -0000
@@ -33,16 +33,12 @@
 #include "winnls.h"
 #include "winreg.h"
 #include "ole2.h"
-#include "docobj.h"
 #include "advpub.h"
 
-#include "mshtml.h"
-#include "mshtmhst.h"
-
 #include "wine/unicode.h"
 #include "wine/debug.h"
 
-#include "initguid.h"
+#define INIT_GUID
 #include "mshtml_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
Index: dlls/mshtml/mshtml_private.h
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/mshtml_private.h,v
retrieving revision 1.21
diff -u -p -r1.21 mshtml_private.h
--- dlls/mshtml/mshtml_private.h	10 Aug 2005 09:54:02 -0000	1.21
+++ dlls/mshtml/mshtml_private.h	10 Aug 2005 10:17:17 -0000
@@ -16,6 +16,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "docobj.h"
+#include "mshtml.h"
+#include "mshtmhst.h"
+
+#ifdef INIT_GUID
+#include "initguid.h"
+#endif
+
 #include "nsiface.h"
 
 #define NS_OK                     ((nsresult)0x00000000L)
Index: dlls/mshtml/nsembed.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/nsembed.c,v
retrieving revision 1.3
diff -u -p -r1.3 nsembed.c
--- dlls/mshtml/nsembed.c	10 Aug 2005 09:54:02 -0000	1.3
+++ dlls/mshtml/nsembed.c	10 Aug 2005 10:17:17 -0000
@@ -27,10 +27,6 @@
 #include "winuser.h"
 #include "winreg.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"
 #include "wine/unicode.h"
Index: dlls/mshtml/oleobj.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/oleobj.c,v
retrieving revision 1.13
diff -u -p -r1.13 oleobj.c
--- dlls/mshtml/oleobj.c	8 Aug 2005 11:07:48 -0000	1.13
+++ dlls/mshtml/oleobj.c	10 Aug 2005 10:17:18 -0000
@@ -27,10 +27,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"
 
Index: dlls/mshtml/olewnd.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/olewnd.c,v
retrieving revision 1.5
diff -u -p -r1.5 olewnd.c
--- dlls/mshtml/olewnd.c	18 Jul 2005 09:13:32 -0000	1.5
+++ dlls/mshtml/olewnd.c	10 Aug 2005 10:17:18 -0000
@@ -27,10 +27,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"
 
Index: dlls/mshtml/persist.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/persist.c,v
retrieving revision 1.7
diff -u -p -r1.7 persist.c
--- dlls/mshtml/persist.c	10 Aug 2005 09:54:02 -0000	1.7
+++ dlls/mshtml/persist.c	10 Aug 2005 10:17:18 -0000
@@ -27,10 +27,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"
 
Index: dlls/mshtml/protocol.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/protocol.c,v
retrieving revision 1.8
diff -u -p -r1.8 protocol.c
--- dlls/mshtml/protocol.c	9 Aug 2005 20:35:36 -0000	1.8
+++ dlls/mshtml/protocol.c	10 Aug 2005 10:17:18 -0000
@@ -27,10 +27,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"
 #include "wine/unicode.h"
Index: dlls/mshtml/service.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/service.c,v
retrieving revision 1.2
diff -u -p -r1.2 service.c
--- dlls/mshtml/service.c	12 Jul 2005 17:00:58 -0000	1.2
+++ dlls/mshtml/service.c	10 Aug 2005 10:17:18 -0000
@@ -27,10 +27,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"
 
@@ -42,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
  * IServiceProvider impementation
  */
 
-#define SERVPROV_THIS(iface) (HTMLDocument*)((BYTE*)(iface)-offsetof(HTMLDocument,lpServiceProviderVtbl))
+#define SERVPROV_THIS(iface) DEFINE_THIS(HTMLDocument, ServiceProvider, iface)
 
 static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv)
 {
Index: dlls/mshtml/view.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/view.c,v
retrieving revision 1.12
diff -u -p -r1.12 view.c
--- dlls/mshtml/view.c	10 Aug 2005 09:54:02 -0000	1.12
+++ dlls/mshtml/view.c	10 Aug 2005 10:17:18 -0000
@@ -28,10 +28,6 @@
 #include "winuser.h"
 #include "wingdi.h"
 #include "ole2.h"
-#include "docobj.h"
-
-#include "mshtml.h"
-#include "mshtmhst.h"
 
 #include "wine/debug.h"