--- chrome/common/pref_names.h
+++ chrome/common/pref_names.h
@@ -62,7 +62,7 @@ extern const wchar_t kAlternateErrorPagesEnabled[];
 extern const wchar_t kDnsPrefetchingEnabled[];
 extern const wchar_t kDnsStartupPrefetchList[];
 extern const wchar_t kDnsHostReferralList[];
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
 extern const wchar_t kCertRevocationCheckingEnabled[];
 extern const wchar_t kSSL2Enabled[];
 extern const wchar_t kSSL3Enabled[];
@@ -101,7 +101,7 @@ extern const wchar_t kPrintingPageHeaderRight[];
 extern const wchar_t kPrintingPageFooterLeft[];
 extern const wchar_t kPrintingPageFooterCenter[];
 extern const wchar_t kPrintingPageFooterRight[];
-#if defined(OS_LINUX)
+#if defined(USE_X11)
 extern const wchar_t kUsesSystemTheme[];
 #endif
 extern const wchar_t kCurrentThemeID[];
diff --git chrome/common/render_messages.h chrome/common/render_messages.h
index 3403448..abe64f8 100644