typedef CORBA_Object GenericInterface;
typedef SpiKeystrokeListener AccessibleKeystrokeListener;
-typedef SpiAccessibleEventListener AccessibleEventListener;
-
-typedef SpiKeyMaskType AccessibleKeyMaskType;
+typedef SpiEventListener AccessibleEventListener;
#endif