diff --git a/widget/android/bindings/Makefile.in b/widget/android/bindings/Makefile.in
index f61a42c041fe..1cc4216e4c81 100644
--- a/widget/android/bindings/Makefile.in
+++ b/widget/android/bindings/Makefile.in
@@ -28,6 +28,7 @@ bindings_exports_FILES := \
   Bundle.h \
   KeyEvent.h \
   MediaCodec.h \
+  MotionEvent.h \
   SurfaceTexture.h \
   $(NULL)
 bindings_exports_DEST = $(DIST)/include
diff --git a/widget/android/bindings/MotionEvent-classes.txt b/widget/android/bindings/MotionEvent-classes.txt
new file mode 100644
index 000000000000..dd38dc000fef
--- /dev/null
+++ b/widget/android/bindings/MotionEvent-classes.txt
@@ -0,0 +1 @@
+android.view.MotionEvent
diff --git a/widget/android/bindings/moz.build b/widget/android/bindings/moz.build
index 539ff43f45e9..77a84ba0c153 100644
--- a/widget/android/bindings/moz.build
+++ b/widget/android/bindings/moz.build
@@ -11,6 +11,7 @@ generated = [
     'Bundle',
     'KeyEvent',
     'MediaCodec',
+    'MotionEvent',
     'SurfaceTexture'
 ]
 
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 5ef365718eae..912ccca70e1d 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -73,6 +73,7 @@ using mozilla::Unused;
 #include "android_npapi.h"
 #include "GeneratedJNINatives.h"
 #include "KeyEvent.h"
+#include "MotionEvent.h"
 
 #include "imgIEncoder.h"
 
@@ -526,23 +527,23 @@ public:
         size_t endIndex = pointerId.Length();
 
         switch (aAction) {
-            case AndroidMotionEvent::ACTION_DOWN:
-            case AndroidMotionEvent::ACTION_POINTER_DOWN:
+            case sdk::MotionEvent::ACTION_DOWN:
+            case sdk::MotionEvent::ACTION_POINTER_DOWN:
                 type = MultiTouchInput::MULTITOUCH_START;
                 break;
-            case AndroidMotionEvent::ACTION_MOVE:
+            case sdk::MotionEvent::ACTION_MOVE:
                 type = MultiTouchInput::MULTITOUCH_MOVE;
                 break;
-            case AndroidMotionEvent::ACTION_UP:
-            case AndroidMotionEvent::ACTION_POINTER_UP:
+            case sdk::MotionEvent::ACTION_UP:
+            case sdk::MotionEvent::ACTION_POINTER_UP:
                 // for pointer-up events we only want the data from
                 // the one pointer that went up
                 type = MultiTouchInput::MULTITOUCH_END;
                 startIndex = aActionIndex;
                 endIndex = aActionIndex + 1;
                 break;
-            case AndroidMotionEvent::ACTION_OUTSIDE:
-            case AndroidMotionEvent::ACTION_CANCEL:
+            case sdk::MotionEvent::ACTION_OUTSIDE:
+            case sdk::MotionEvent::ACTION_CANCEL:
                 type = MultiTouchInput::MULTITOUCH_CANCEL;
                 break;
             default: