--- chrome/browser/tab_contents/tab_contents.h
+++ chrome/browser/tab_contents/tab_contents.h
@@ -40,7 +40,7 @@
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/webpreferences.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_NIX)
 // Remove when we've finished porting the supporting classes.
 #include "chrome/common/temp_scaffolding_stubs.h"
 #elif defined(OS_WIN) || defined(OS_MACOSX)
@@ -641,7 +641,7 @@ class TabContents : public PageNavigator,
   friend class TabContentsViewWin;
 #elif defined(OS_MACOSX)
   friend class TabContentsViewMac;
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
   friend class TabContentsViewGtk;
 #endif
 
diff --git chrome/browser/tab_contents/thumbnail_generator.cc chrome/browser/tab_contents/thumbnail_generator.cc
index 1a5c5c4..203621c 100644