diff --git a/src/native/jawtrenderer/JAWTRenderer.h b/src/native/jawtrenderer/JAWTRenderer.h
index a5105e9e84da0966d8b9515f202cf830dd969156..53eb8b9261b3493b722425d4d6e34a3413846a31 100644
--- a/src/native/jawtrenderer/JAWTRenderer.h
+++ b/src/native/jawtrenderer/JAWTRenderer.h
@@ -8,12 +8,20 @@
 #ifndef _JAWTRENDERER_H_
 #define _JAWTRENDERER_H_
 
-#include <jawt.h>
+#ifndef __ANDROID__
+    #include <jawt.h>
+#else /* #ifndef __ANDROID__ */
+    typedef void JAWT_DrawingSurfaceInfo;
+#endif /* #ifndef __ANDROID__ */
 #include <jni.h>
 
+#ifndef NULL
+#define NULL 0
+#endif /* #ifndef NULL */
+
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* #ifdef __cplusplus */
 
 void JAWTRenderer_close
     (JNIEnv *env, jclass clazz, jlong handle, jobject component);
@@ -31,6 +39,6 @@ jstring JAWTRenderer_sysctlbyname(JNIEnv *env, jstring name);
 
 #ifdef __cplusplus
 } /* extern "C" { */
-#endif
+#endif /* #ifdef __cplusplus */
 
 #endif /* _JAWTRENDERER_H_ */
diff --git a/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c b/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
index 236350e28ebc05ba279f7492b5598fe4ea77ec29..671f2ab53cf7a5968bbd17496009d22801919540 100644
--- a/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
+++ b/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
@@ -27,6 +27,9 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
     (JNIEnv *env, jclass clazz, jlong handle, jobject component, jobject g,
         jint zOrder)
 {
+#ifdef __ANDROID__
+    return JAWTRenderer_paint(0, NULL, clazz, handle, g, zOrder);
+#else /* #ifdef __ANDROID__ */
     JAWT awt;
     jboolean awtIsAvailable;
     jboolean wantsPaint;
@@ -93,6 +96,7 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
         }
     }
     return wantsPaint;
+#endif /* #ifdef __ANDROID__ */
 }
 
 JNIEXPORT jboolean JNICALL