Merge the rest of include/wine/obj_base.h into include/objbase.h.

include/Makefile.in

@@ -203,7 +203,6 @@ WINE_INCLUDES = \
 	debug.h \
 	exception.h \
 	library.h \
-	obj_base.h \
 	obj_cache.h \
 	obj_comcat.h \
 	obj_commdlgbrowser.h \

include/unknwn.h

@@ -8,9 +8,6 @@
 extern "C" {
 #endif
 #include "wtypes.h"
-#define __WINE_INCLUDE_UNKNWN
-#include "wine/obj_base.h"
-#undef __WINE_INCLUDE_UNKNWN
 #if defined(__cplusplus) && !defined(CINTERFACE)
  #ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE
   #define ICOM_COM_INTERFACE_ATTRIBUTE __attribute__((com_interface))

include/unknwn.idl

@@ -18,11 +18,6 @@
 
 import "wtypes.idl";
 
-/* need this until objidl.h and objbase.h is complete */
-cpp_quote("#define __WINE_INCLUDE_UNKNWN")
-cpp_quote("#include \"wine/obj_base.h\"")
-cpp_quote("#undef __WINE_INCLUDE_UNKNWN")
-
 /* COM vtable compatibility macros for g++ */
 /* Included here because the generated header needs them */