--- chrome/browser/app_modal_dialog.h
+++ chrome/browser/app_modal_dialog.h
@@ -14,7 +14,7 @@
 #if defined(OS_WIN)
 class JavascriptMessageBoxDialog;
 typedef JavascriptMessageBoxDialog* NativeDialog;
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
 typedef struct _GtkWidget GtkWidget;
 typedef GtkWidget* NativeDialog;
 #elif defined(OS_MACOSX)
diff --git chrome/browser/autocomplete/autocomplete_popup_view.h chrome/browser/autocomplete/autocomplete_popup_view.h
index 57670c5..4f68cf7 100644