+/*
+ * A load of opaque handles that people can't poke at.
+ */
#ifndef _SPI_IMPL_H_
#define _SPI_IMPL_H_
-#include <orb/orbit.h>
-
-typedef unsigned int boolean;
-
-typedef CORBA_Object Accessible;
-typedef CORBA_Object AccessibleAction;
-typedef CORBA_Object AccessibleApplication;
-typedef CORBA_Object AccessibleComponent;
-typedef CORBA_Object AccessibleEditableText;
-typedef CORBA_Object AccessibleHyperlink;
-typedef CORBA_Object AccessibleHypertext;
-typedef CORBA_Object AccessibleImage;
-typedef CORBA_Object AccessibleRelation;
-typedef CORBA_Object AccessibleSelection;
-typedef CORBA_Object AccessibleStateSet;
-typedef CORBA_Object AccessibleTable;
-typedef CORBA_Object AccessibleText;
-typedef CORBA_Object AccessibleValue;
-typedef CORBA_Object Accessibility_Registry;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _Accessible AccessibleUnknown;
+typedef AccessibleUnknown Accessible;
+
+typedef Accessible AccessibleAction;
+typedef Accessible AccessibleApplication;
+typedef Accessible AccessibleComponent;
+typedef Accessible AccessibleEditableText;
+typedef Accessible AccessibleHyperlink;
+typedef Accessible AccessibleHypertext;
+typedef Accessible AccessibleImage;
+typedef Accessible AccessibleRelation;
+typedef Accessible AccessibleSelection;
+typedef Accessible AccessibleStateSet;
+typedef Accessible AccessibleStreamableContent;
+typedef Accessible AccessibleTable;
+typedef Accessible AccessibleText;
+typedef Accessible AccessibleValue;
+typedef Accessible AccessibilityRegistry;
+
+typedef void AccessibleEventListener;
+typedef void AccessibleKeystrokeListener;
+
+typedef unsigned int SPIBoolean;
+
+
+#ifdef __cplusplus
+}
+#endif
#endif