1 files changed, 5 insertions, 3 deletions
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 08f2255..39e6103 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -4,7 +4,9 @@
 
 #include "views/controls/tree/tree_view.h"
 
-#include <shellapi.h>
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlmisc.h>
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/icon_util.h"
@@ -30,7 +32,7 @@ TreeView::TreeView()
       process_enter_(false),
       show_context_menu_only_when_node_selected_(true),
       select_on_right_mouse_down_(true),
-      wrapper_(this),
+      ALLOW_THIS_IN_INITIALIZER_LIST(wrapper_(this)),
       original_handler_(NULL),
       drag_enabled_(false),
       has_custom_icons_(false),
@@ -481,7 +483,7 @@ bool TreeView::OnKeyDown(int virtual_key_code) {
   return false;
 }
 
-void TreeView::OnContextMenu(const CPoint& location) {
+void TreeView::OnContextMenu(const WTL::CPoint& location) {
   if (!GetContextMenuController())
     return;