Move includes of interfaces to mshtml_private.h.

dlls/mshtml/htmldoc.c

@@ -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"
 

dlls/mshtml/main.c

@@ -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);

dlls/mshtml/mshtml_private.h

@@ -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)

dlls/mshtml/nsembed.c

@@ -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"

dlls/mshtml/oleobj.c

@@ -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"
 

dlls/mshtml/olewnd.c

@@ -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"
 

dlls/mshtml/persist.c

@@ -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"
 

dlls/mshtml/protocol.c

@@ -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"

dlls/mshtml/service.c

@@ -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)
 {

dlls/mshtml/view.c

@@ -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"