diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp
index d2f284e1fd11..c58c3e0c95f3 100644
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -614,7 +614,8 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
 
     PRInt32 status;
     nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
-    if (mOptions.antialias && 
+    if (mOptions.antialias &&
+        gfxInfo &&
         NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_WEBGL_MSAA, &status))) {
         if (status == nsIGfxInfo::FEATURE_NO_INFO || forceMSAA) {
             PRUint32 msaaLevel = Preferences::GetUint("webgl.msaa-level", 2);
diff --git a/hal/Makefile.in b/hal/Makefile.in
index 990359ee6156..ec57febc6934 100644
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -66,7 +66,7 @@ CPPSRCS = \
   SandboxHal.cpp \
   $(NULL)
 
-ifeq (Android,$(OS_TARGET))
+ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += AndroidHal.cpp
 else ifeq (Linux,$(OS_TARGET))
 CPPSRCS += LinuxHal.cpp
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 1162f561aea4..b1ded4504995 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -315,7 +315,7 @@ endif
 
 STATIC_LIBS += thebes gl ycbcr
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+ifeq ($(OS_TARGET),Android)
 STATIC_LIBS += profiler
 endif
 
diff --git a/widget/src/gonk/nsAppShell.h b/widget/src/gonk/nsAppShell.h
index 632cc44d3000..bb82c279da71 100644
--- a/widget/src/gonk/nsAppShell.h
+++ b/widget/src/gonk/nsAppShell.h
@@ -39,6 +39,7 @@
 #define nsAppShell_h
 
 #include "nsBaseAppShell.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 bool ProcessNextEvent();
diff --git a/widget/src/gonk/nsWindow.h b/widget/src/gonk/nsWindow.h
index a43be5b1e29b..e1f59188e955 100644
--- a/widget/src/gonk/nsWindow.h
+++ b/widget/src/gonk/nsWindow.h
@@ -102,7 +102,6 @@ public:
     virtual nsIntPoint WidgetToScreenOffset();
     NS_IMETHOD DispatchEvent(nsGUIEvent *aEvent, nsEventStatus &aStatus);
     NS_IMETHOD CaptureRollupEvents(nsIRollupListener *aListener,
-                                   nsIMenuRollup *aMenuRollup,
                                    bool aDoCapture,
                                    bool aConsumeRollupEvent)
     {