--- include/dinput.h.orig	Sat Oct 21 02:27:52 2000
+++ include/dinput.h	Mon May 19 12:42:48 2003
@@ -676,13 +676,10 @@
 typedef const DIACTIONA *LPCDIACTIONA;
 typedef const DIACTIONW *LPCDIACTIONW;
 #ifdef UNICODE
-typedef DIACTIONW DIACTION;
 typedef LPCDIACTIONW LPCDIACTION;
 #else
-typedef DIACTIONA DIACTION;
 typedef LPCDIACTIONA LPCDIACTION;
 #endif // UNICODE
-typedef const DIACTION *LPCDIACTION;
 
 
 #define DIA_FORCEFEEDBACK       0x00000001
@@ -738,16 +735,14 @@
 typedef DIACTIONFORMATA DIACTIONFORMAT;
 typedef LPDIACTIONFORMATA LPDIACTIONFORMAT;
 #endif // UNICODE
+
 typedef const DIACTIONFORMATA *LPCDIACTIONFORMATA;
 typedef const DIACTIONFORMATW *LPCDIACTIONFORMATW;
 #ifdef UNICODE
-typedef DIACTIONFORMATW DIACTIONFORMAT;
 typedef LPCDIACTIONFORMATW LPCDIACTIONFORMAT;
 #else
-typedef DIACTIONFORMATA DIACTIONFORMAT;
 typedef LPCDIACTIONFORMATA LPCDIACTIONFORMAT;
 #endif // UNICODE
-typedef const DIACTIONFORMAT *LPCDIACTIONFORMAT;
 
 #define DIAFTS_NEWDEVICELOW     0xFFFFFFFF
 #define DIAFTS_NEWDEVICEHIGH    0xFFFFFFFF
@@ -815,16 +810,14 @@
 typedef DICONFIGUREDEVICESPARAMSA DICONFIGUREDEVICESPARAMS;
 typedef LPDICONFIGUREDEVICESPARAMSA LPDICONFIGUREDEVICESPARAMS;
 #endif // UNICODE
+
 typedef const DICONFIGUREDEVICESPARAMSA *LPCDICONFIGUREDEVICESPARAMSA;
 typedef const DICONFIGUREDEVICESPARAMSW *LPCDICONFIGUREDEVICESPARAMSW;
 #ifdef UNICODE
-typedef DICONFIGUREDEVICESPARAMSW DICONFIGUREDEVICESPARAMS;
 typedef LPCDICONFIGUREDEVICESPARAMSW LPCDICONFIGUREDEVICESPARAMS;
 #else
-typedef DICONFIGUREDEVICESPARAMSA DICONFIGUREDEVICESPARAMS;
 typedef LPCDICONFIGUREDEVICESPARAMSA LPCDICONFIGUREDEVICESPARAMS;
 #endif // UNICODE
-typedef const DICONFIGUREDEVICESPARAMS *LPCDICONFIGUREDEVICESPARAMS;
 
 
 #define DIDIFT_CONFIGURATION    0x00000001
@@ -868,16 +861,14 @@
 typedef DIDEVICEIMAGEINFOA DIDEVICEIMAGEINFO;
 typedef LPDIDEVICEIMAGEINFOA LPDIDEVICEIMAGEINFO;
 #endif // UNICODE
+
 typedef const DIDEVICEIMAGEINFOA *LPCDIDEVICEIMAGEINFOA;
 typedef const DIDEVICEIMAGEINFOW *LPCDIDEVICEIMAGEINFOW;
 #ifdef UNICODE
-typedef DIDEVICEIMAGEINFOW DIDEVICEIMAGEINFO;
 typedef LPCDIDEVICEIMAGEINFOW LPCDIDEVICEIMAGEINFO;
 #else
-typedef DIDEVICEIMAGEINFOA DIDEVICEIMAGEINFO;
 typedef LPCDIDEVICEIMAGEINFOA LPCDIDEVICEIMAGEINFO;
 #endif // UNICODE
-typedef const DIDEVICEIMAGEINFO *LPCDIDEVICEIMAGEINFO;
 
 typedef struct _DIDEVICEIMAGEINFOHEADERA {
     DWORD       dwSize;
@@ -908,16 +899,14 @@
 typedef DIDEVICEIMAGEINFOHEADERA DIDEVICEIMAGEINFOHEADER;
 typedef LPDIDEVICEIMAGEINFOHEADERA LPDIDEVICEIMAGEINFOHEADER;
 #endif // UNICODE
+
 typedef const DIDEVICEIMAGEINFOHEADERA *LPCDIDEVICEIMAGEINFOHEADERA;
 typedef const DIDEVICEIMAGEINFOHEADERW *LPCDIDEVICEIMAGEINFOHEADERW;
 #ifdef UNICODE
-typedef DIDEVICEIMAGEINFOHEADERW DIDEVICEIMAGEINFOHEADER;
 typedef LPCDIDEVICEIMAGEINFOHEADERW LPCDIDEVICEIMAGEINFOHEADER;
 #else
-typedef DIDEVICEIMAGEINFOHEADERA DIDEVICEIMAGEINFOHEADER;
 typedef LPCDIDEVICEIMAGEINFOHEADERA LPCDIDEVICEIMAGEINFOHEADER;
 #endif // UNICODE
-typedef const DIDEVICEIMAGEINFOHEADER *LPCDIDEVICEIMAGEINFOHEADER;
 
 #endif /* DIRECTINPUT_VERSION > 0x0700 */
 
@@ -1279,13 +1268,10 @@
 typedef const DIDEVICEINSTANCEA *LPCDIDEVICEINSTANCEA;
 typedef const DIDEVICEINSTANCEW *LPCDIDEVICEINSTANCEW;
 #ifdef UNICODE
-typedef DIDEVICEINSTANCEW DIDEVICEINSTANCE;
 typedef LPCDIDEVICEINSTANCEW LPCDIDEVICEINSTANCE;
 #else
-typedef DIDEVICEINSTANCEA DIDEVICEINSTANCE;
 typedef LPCDIDEVICEINSTANCEA LPCDIDEVICEINSTANCE;
 #endif // UNICODE
-typedef const DIDEVICEINSTANCE  *LPCDIDEVICEINSTANCE;
 
 #undef INTERFACE
 #define INTERFACE IDirectInputDeviceW
