Jacek Caban : vbscript: Moved includes required by vbscript.h to the header .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4f5b2a4c3acbd23c1da981523b674aae5f4c653c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4f5b2a4c3acbd23c1da981523b...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Sep  2 13:16:27 2011 +0200

vbscript: Moved includes required by vbscript.h to the header.

---

 dlls/vbscript/vbscript.c      |   10 +---------
 dlls/vbscript/vbscript.h      |    8 ++++++++
 dlls/vbscript/vbscript_main.c |   11 +----------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index 04a513f..b50cbd6 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -16,19 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 
-#include <stdarg.h>
 #include <assert.h>
 
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "ole2.h"
-#include "objsafe.h"
-
 #include "vbscript.h"
+#include "objsafe.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h
index 98a4486..29909f2 100644
--- a/dlls/vbscript/vbscript.h
+++ b/dlls/vbscript/vbscript.h
@@ -16,7 +16,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "ole2.h"
 #include "activscp.h"
+
 #include "vbscript_classes.h"
 
 typedef struct {
diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c
index 71eaa86..fc31aed 100644
--- a/dlls/vbscript/vbscript_main.c
+++ b/dlls/vbscript/vbscript_main.c
@@ -16,20 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
 #include "initguid.h"
 
-#include "ole2.h"
+#include "vbscript.h"
 #include "objsafe.h"
 #include "rpcproxy.h"
-#include "vbscript.h"
 #include "vbscript_classes.h"
 
 #include "wine/debug.h"