3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index f6ed585..401affd 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -749,7 +749,6 @@ if not env.Bit('windows'):
       'sessions/session_backend.cc',
       'sessions/session_restore.cc',
       'shell_integration.cc',
-      'tab_contents/infobar_delegate.cc',
       'tab_contents/interstitial_page.cc',
       'tab_contents/native_ui_contents.cc',
       'tab_contents/render_view_context_menu.cc',
diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc
index eaeb013..a39bdfa 100644
--- a/chrome/browser/tab_contents/infobar_delegate.cc
+++ b/chrome/browser/tab_contents/infobar_delegate.cc
@@ -5,13 +5,19 @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
 
 #include "generated_resources.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/tab_contents/tab_contents.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
+
 // InfoBarDelegate: ------------------------------------------------------------
 
 bool InfoBarDelegate::ShouldExpire(
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index d84e563..c1bf3fa 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -9,11 +9,6 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
-// TODO(port): remove when dependent classes are ported
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
 #include "base/linked_ptr.h"
 #include "base/ref_counted.h"
 #include "googleurl/src/gurl.h"