From ed4846bed92d9c6e2bafa83d729863de018a978e Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 27 May 2010 17:04:08 +0200
Subject: [PATCH] user32: Don't include winbase16.h.

---
 dlls/user32/exticon.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c
index a720cf32591..fb9ff031348 100644
--- a/dlls/user32/exticon.c
+++ b/dlls/user32/exticon.c
@@ -37,7 +37,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "wine/winbase16.h"
+#include "winnls.h"
 #include "user_private.h"
 #include "wine/debug.h"
 
@@ -65,6 +65,26 @@ typedef struct
     icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */
 } icoICONDIR, *LPicoICONDIR;
 
+typedef struct
+{
+    WORD offset;
+    WORD length;
+    WORD flags;
+    WORD id;
+    WORD handle;
+    WORD usage;
+} NE_NAMEINFO;
+
+typedef struct
+{
+    WORD  type_id;
+    WORD  count;
+    DWORD resloader;
+} NE_TYPEINFO;
+
+#define NE_RSCTYPE_ICON        0x8003
+#define NE_RSCTYPE_GROUP_ICON  0x800e
+
 #include "poppack.h"
 
 #if 0