Move static variables out of header file, also the local interface

dlls/shdocvw/events.c

@@ -27,6 +27,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
+static IConnectionPointImpl SHDOCVW_ConnectionPoint;
 
 static const GUID IID_INotifyDBEvents =
     { 0xdb526cc0, 0xd188, 0x11cd, { 0xad, 0x48, 0x00, 0xaa, 0x00, 0x3c, 0x9c, 0xb6 } };

dlls/shdocvw/oleobject.c

@@ -30,6 +30,30 @@
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
+ * IOleControl declaration for SHDOCVW.DLL
+ */
+typedef struct
+{
+    /* IUnknown fields */
+    const IOleControlVtbl *lpVtbl;
+    DWORD ref;
+} IOleControlImpl;
+
+static IOleControlImpl SHDOCVW_OleControl;
+
+/**********************************************************************
+ * IOleInPlaceObject declaration for SHDOCVW.DLL
+ */
+typedef struct
+{
+    /* IUnknown fields */
+    const IOleInPlaceObjectVtbl *lpVtbl;
+    DWORD ref;
+} IOleInPlaceObjectImpl;
+
+static IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject;
+
+/**********************************************************************
  * Implement the IOleObject interface for the web browser component
  *
  * Based on DefaultHandler code in dlls/ole32/defaulthandler.c.

dlls/shdocvw/shdocvw.h

@@ -60,33 +60,6 @@ typedef struct
 
 extern IOleObjectImpl SHDOCVW_OleObject;
 
-
-/**********************************************************************
- * IOleInPlaceObject declaration for SHDOCVW.DLL
- */
-typedef struct
-{
-    /* IUnknown fields */
-    const IOleInPlaceObjectVtbl *lpVtbl;
-    DWORD ref;
-} IOleInPlaceObjectImpl;
-
-extern IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject;
-
-
-/**********************************************************************
- * IOleControl declaration for SHDOCVW.DLL
- */
-typedef struct
-{
-    /* IUnknown fields */
-    const IOleControlVtbl *lpVtbl;
-    DWORD ref;
-} IOleControlImpl;
-
-extern IOleControlImpl SHDOCVW_OleControl;
-
-
 /**********************************************************************
  * IWebBrowser declaration for SHDOCVW.DLL
  */
@@ -188,8 +161,6 @@ typedef struct
     DWORD ref;
 } IConnectionPointImpl;
 
-extern IConnectionPointImpl SHDOCVW_ConnectionPoint;
-
 /**********************************************************************
  * Dll lifetime tracking declaration for shdocvw.dll
  */