--- a/khronosfws/openmax_al/inc/openmaxalwrapper.h	Fri Jun 25 17:36:03 2010 -0500
+++ b/khronosfws/openmax_al/inc/openmaxalwrapper.h	Fri Jul 09 16:43:35 2010 -0500
@@ -16,16 +16,14 @@
 *               to DEF files.
 *
 */
-#ifndef _OPENMAXAL_WRAPPER_H_
-#define _OPENMAXAL_WRAPPER_H_
+#ifndef OPENMAXAL_WRAPPER_H_
+#define OPENMAXAL_WRAPPER_H_
 
-#include <OpenMAXAL_Platform.h>
-#undef XA_API
-
-#define XA_API __declspec(dllexport)
- 
+#include <e32def.h>
 #include <OpenMAXAL.h>
 #include <xanokiavolumeextitf.h>
 #include <xanokialinearvolumeitf.h>
+#include <xaradioitfext.h>
 
-#endif
+#endif //ends OPENMAXAL_WRAPPER_H_
+