Uncomment the typedef in the DECLARE_INTERFACE macro, and get rid of
duplicate typedefs.

diff --git a/include/mapiutil.h b/include/mapiutil.h
index b17e5c0..408144e 100644
--- a/include/mapiutil.h
+++ b/include/mapiutil.h
@@ -46,8 +46,7 @@
 
 BOOL WINAPI FEqualNames(LPMAPINAMEID,LPMAPINAMEID);
 
-typedef struct IPropData IPropData;
-typedef IPropData *LPPROPDATA;
+typedef struct IPropData *LPPROPDATA;
 
 #define IPROP_READONLY  0x00001U
 #define IPROP_READWRITE 0x00002U
@@ -113,8 +112,7 @@
 typedef SCODE (WINAPI CREATECONVERSATIONINDEX)(ULONG,LPBYTE,ULONG*,LPBYTE*);
 typedef CREATECONVERSATIONINDEX *LPCREATECONVERSATIONINDEX;
 
-typedef struct ITableData ITableData;
-typedef ITableData *LPTABLEDATA;
+typedef struct ITableData *LPTABLEDATA;
 
 typedef void (WINAPI CALLERRELEASE)(ULONG,LPTABLEDATA,LPMAPITABLE);