diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp
index a23253f8382..69d7a25934d 100644
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@@ -500,9 +500,9 @@ PuppetWidget::ExecuteNativeKeyBinding(NativeKeyBindingsType aType,
                                       void* aCallbackData)
 {
   // B2G doesn't have native key bindings.
-#ifdef MOZ_B2G
+#ifdef MOZ_WIDGET_GONK
   return false;
-#else // #ifdef MOZ_B2G
+#else // #ifdef MOZ_WIDGET_GONK
   MOZ_ASSERT(mNativeKeyCommandsValid);
 
   nsTArray<mozilla::CommandInt>& commands = mSingleLineCommands;
diff --git a/widget/nsContentProcessWidgetFactory.cpp b/widget/nsContentProcessWidgetFactory.cpp
index 88e6ec48ff9..5703b2607eb 100644
--- a/widget/nsContentProcessWidgetFactory.cpp
+++ b/widget/nsContentProcessWidgetFactory.cpp
@@ -17,7 +17,7 @@
 using namespace mozilla;
 using namespace mozilla::widget;
 
-#ifndef MOZ_B2G
+#ifndef MOZ_WIDGET_GONK
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardProxy)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsColorPickerProxy)
@@ -66,4 +66,4 @@ static const mozilla::Module kWidgetModule = {
 
 NSMODULE_DEFN(nsContentProcessWidgetModule) = &kWidgetModule;
 
-#endif /* MOZ_B2G */
+#endif /* MOZ_WIDGET_GONK */