Moved rpc.h inclusion in widl-generated file so that tests compile.

include/wtypes.h

-/*** Autogenerated by WIDL 0.1 from ../../include/wtypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 0.1 from wtypes.idl - Do not edit ***/
+#include "rpc.h"
+#include "rpcndr.h"
+
 #ifndef __WIDL_WTYPES_H
 #define __WIDL_WTYPES_H
 #include "basetsd.h"
 #include "guiddef.h"
-#include "rpc.h"
-#include "rpcndr.h"
 typedef CHAR OLECHAR16;
 typedef LPSTR LPOLESTR16;
 typedef LPCSTR LPCOLESTR16;

include/wtypes.idl

@@ -30,8 +30,6 @@ interface IWinTypes
 
 cpp_quote("#include \"basetsd.h\"")
 cpp_quote("#include \"guiddef.h\"")
-cpp_quote("#include \"rpc.h\"")
-cpp_quote("#include \"rpcndr.h\"")
 
 /* from Wine's pre-WIDL wtypes.h */
 /* FIXME: does not belong here */

tools/widl/widl.c

@@ -209,6 +209,8 @@ int main(int argc,char *argv[])
 
   header = fopen(header_name, "w");
   fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", WIDL_FULLVERSION, input_name);
+  fprintf(header, "#include \"rpc.h\"\n" );
+  fprintf(header, "#include \"rpcndr.h\"\n\n" );
   fprintf(header, "#ifndef __WIDL_%s\n", header_token);
   fprintf(header, "#define __WIDL_%s\n", header_token);