diff --git a/atom.gyp b/atom.gyp
index e2fde27ef4ca..09bb7cdb52d1 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -174,6 +174,12 @@
       'atom/common/draggable_region.cc',
       'atom/common/draggable_region.h',
       'atom/common/linux/application_info.cc',
+      'atom/common/native_mate_converters/file_path_converter.h',
+      'atom/common/native_mate_converters/string16_converter.h',
+      'atom/common/native_mate_converters/v8_value_converter.cc',
+      'atom/common/native_mate_converters/v8_value_converter.h',
+      'atom/common/native_mate_converters/value_converter.cc',
+      'atom/common/native_mate_converters/value_converter.h',
       'atom/common/node_bindings.cc',
       'atom/common/node_bindings.h',
       'atom/common/node_bindings_linux.cc',
@@ -182,6 +188,7 @@
       'atom/common/node_bindings_mac.h',
       'atom/common/node_bindings_win.cc',
       'atom/common/node_bindings_win.h',
+      'atom/common/node_includes.h',
       'atom/common/options_switches.cc',
       'atom/common/options_switches.h',
       'atom/common/platform_util.h',
@@ -189,11 +196,8 @@
       'atom/common/platform_util_mac.mm',
       'atom/common/platform_util_win.cc',
       'atom/common/swap_or_assign.h',
-      'atom/common/v8/node_common.h',
       'atom/common/v8/scoped_persistent.h',
       'atom/common/v8/native_type_conversions.h',
-      'atom/common/v8/v8_value_converter.cc',
-      'atom/common/v8/v8_value_converter.h',
       'atom/renderer/api/atom_api_renderer_ipc.cc',
       'atom/renderer/api/atom_renderer_bindings.cc',
       'atom/renderer/api/atom_renderer_bindings.h',
diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 71ce4730f0bc..66332d309a66 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -11,7 +11,7 @@
 #include "atom/browser/browser.h"
 #include "atom/common/v8/native_type_conversions.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/browser/api/atom_api_auto_updater.cc b/atom/browser/api/atom_api_auto_updater.cc
index 1ed8588e41d7..54dbde83b6ce 100644
--- a/atom/browser/api/atom_api_auto_updater.cc
+++ b/atom/browser/api/atom_api_auto_updater.cc
@@ -9,7 +9,7 @@
 #include "atom/browser/auto_updater.h"
 #include "atom/common/v8/native_type_conversions.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/browser/api/atom_api_browser_ipc.cc b/atom/browser/api/atom_api_browser_ipc.cc
index 2d062421444f..71da2c7cccfd 100644
--- a/atom/browser/api/atom_api_browser_ipc.cc
+++ b/atom/browser/api/atom_api_browser_ipc.cc
@@ -5,7 +5,7 @@
 #include "atom/browser/api/atom_api_browser_ipc.h"
 
 #include "atom/common/api/api_messages.h"
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/render_view_host.h"
 
diff --git a/atom/browser/api/atom_api_dialog.cc b/atom/browser/api/atom_api_dialog.cc
index 4cc5b4bab5f7..b4d120f065e2 100644
--- a/atom/browser/api/atom_api_dialog.cc
+++ b/atom/browser/api/atom_api_dialog.cc
@@ -10,11 +10,11 @@
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/file_dialog.h"
 #include "atom/browser/ui/message_box.h"
-#include "atom/common/v8_converters/file_path_converter.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/scoped_persistent.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace mate {
 
diff --git a/atom/browser/api/atom_api_event.cc b/atom/browser/api/atom_api_event.cc
index b1f14066770f..f1d305d0e90b 100644
--- a/atom/browser/api/atom_api_event.cc
+++ b/atom/browser/api/atom_api_event.cc
@@ -5,7 +5,7 @@
 #include "atom/browser/api/atom_api_event.h"
 
 #include "atom/common/api/api_messages.h"
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/web_contents.h"
 
diff --git a/atom/browser/api/atom_api_menu.cc b/atom/browser/api/atom_api_menu.cc
index ea89ce5b6646..f1088be1387d 100644
--- a/atom/browser/api/atom_api_menu.cc
+++ b/atom/browser/api/atom_api_menu.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "atom/browser/ui/accelerator_util.h"
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/v8/native_type_conversions.h"
 
 #define UNWRAP_MEMNU_AND_CHECK \
diff --git a/atom/browser/api/atom_api_menu_gtk.cc b/atom/browser/api/atom_api_menu_gtk.cc
index 0265ac74a324..4f27ed94ae5a 100644
--- a/atom/browser/api/atom_api_menu_gtk.cc
+++ b/atom/browser/api/atom_api_menu_gtk.cc
@@ -10,7 +10,7 @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
index be8a9f5f8696..65db434110ab 100644
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -7,7 +7,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "atom/browser/native_window.h"
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
diff --git a/atom/browser/api/atom_api_menu_win.cc b/atom/browser/api/atom_api_menu_win.cc
index d5d820e09db3..1943e45fa677 100644
--- a/atom/browser/api/atom_api_menu_win.cc
+++ b/atom/browser/api/atom_api_menu_win.cc
@@ -10,7 +10,7 @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/browser/api/atom_api_power_monitor.cc b/atom/browser/api/atom_api_power_monitor.cc
index d045c1866c2e..73c8c9dc8e21 100644
--- a/atom/browser/api/atom_api_power_monitor.cc
+++ b/atom/browser/api/atom_api_power_monitor.cc
@@ -7,7 +7,7 @@
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc
index 60c7b8cb6206..6bb487503d59 100644
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -13,7 +13,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 12aa099ee390..ecbb60625609 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -16,7 +16,7 @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 #include "vendor/node/src/node_buffer.h"
 
 using content::NavigationController;
diff --git a/atom/browser/api/atom_browser_bindings.cc b/atom/browser/api/atom_browser_bindings.cc
index 94c925f8a0b7..1d25fa19fe1c 100644
--- a/atom/browser/api/atom_browser_bindings.cc
+++ b/atom/browser/api/atom_browser_bindings.cc
@@ -11,7 +11,7 @@
 #include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/browser_thread.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc
index 84f15d620271..139b15801424 100644
--- a/atom/browser/atom_browser_main_parts.cc
+++ b/atom/browser/atom_browser_main_parts.cc
@@ -15,7 +15,7 @@
 #include "ui/gfx/win/dpi.h"
 #endif
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/common/api/atom_api_clipboard.cc b/atom/common/api/atom_api_clipboard.cc
index 3bb375860830..e26f2a310cae 100644
--- a/atom/common/api/atom_api_clipboard.cc
+++ b/atom/common/api/atom_api_clipboard.cc
@@ -8,7 +8,7 @@
 #include "native_mate/dictionary.h"
 #include "ui/base/clipboard/clipboard.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace {
 
diff --git a/atom/common/api/atom_api_crash_reporter.cc b/atom/common/api/atom_api_crash_reporter.cc
index a3338e7ed3cd..06d2f8b49b6b 100644
--- a/atom/common/api/atom_api_crash_reporter.cc
+++ b/atom/common/api/atom_api_crash_reporter.cc
@@ -9,7 +9,7 @@
 #include "base/bind.h"
 #include "native_mate/dictionary.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace mate {
 
diff --git a/atom/common/api/atom_api_event_emitter.cc b/atom/common/api/atom_api_event_emitter.cc
index 9588a3b5c9e1..899ee3cd884e 100644
--- a/atom/common/api/atom_api_event_emitter.cc
+++ b/atom/common/api/atom_api_event_emitter.cc
@@ -10,7 +10,7 @@
 #include "atom/common/v8/native_type_conversions.h"
 #include "base/logging.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/common/api/atom_api_id_weak_map.cc b/atom/common/api/atom_api_id_weak_map.cc
index 43df9b5e43cf..e6b6d0e76678 100644
--- a/atom/common/api/atom_api_id_weak_map.cc
+++ b/atom/common/api/atom_api_id_weak_map.cc
@@ -10,7 +10,7 @@
 #include "native_mate/constructor.h"
 #include "native_mate/object_template_builder.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/common/api/atom_api_screen.cc b/atom/common/api/atom_api_screen.cc
index 1b244cde281b..980183bc3032 100644
--- a/atom/common/api/atom_api_screen.cc
+++ b/atom/common/api/atom_api_screen.cc
@@ -5,7 +5,7 @@
 #include "native_mate/dictionary.h"
 #include "ui/gfx/screen.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 #if defined(TOOLKIT_GTK)
 #include "base/command_line.h"
diff --git a/atom/common/api/atom_api_shell.cc b/atom/common/api/atom_api_shell.cc
index edb90997a348..9109b9c3c10e 100644
--- a/atom/common/api/atom_api_shell.cc
+++ b/atom/common/api/atom_api_shell.cc
@@ -5,11 +5,11 @@
 #include <string>
 
 #include "atom/common/platform_util.h"
-#include "atom/common/v8_converters/file_path_converter.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "native_mate/dictionary.h"
 #include "url/gurl.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace mate {
 
diff --git a/atom/common/api/atom_api_v8_util.cc b/atom/common/api/atom_api_v8_util.cc
index 8889591f0b26..f6e2e6d89a45 100644
--- a/atom/common/api/atom_api_v8_util.cc
+++ b/atom/common/api/atom_api_v8_util.cc
@@ -6,7 +6,7 @@
 #include "native_mate/dictionary.h"
 #include "v8/include/v8-profiler.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace {
 
diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index 26c5daf301e4..f3ba3da3b546 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -10,7 +10,7 @@
 #include "atom/common/v8/native_type_conversions.h"
 #include "base/logging.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/common/api/atom_extensions.cc b/atom/common/api/atom_extensions.cc
index 16cd74e7846c..18c8a24d4d19 100644
--- a/atom/common/api/atom_extensions.cc
+++ b/atom/common/api/atom_extensions.cc
@@ -8,7 +8,7 @@
 #include "base/strings/string_util.h"
 #include "vendor/node/src/node_version.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/common/v8_converters/file_path_converter.h b/atom/common/native_mate_converters/file_path_converter.h
similarity index 67%
rename from atom/common/v8_converters/file_path_converter.h
rename to atom/common/native_mate_converters/file_path_converter.h
index 2606ed46c5d5..91e33d92c773 100644
--- a/atom/common/v8_converters/file_path_converter.h
+++ b/atom/common/native_mate_converters/file_path_converter.h
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_V8_CONVERTERS_FILE_PATH_CONVERTER_H_
-#define ATOM_COMMON_V8_CONVERTERS_FILE_PATH_CONVERTER_H_
+#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
+#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
 
-#include "atom/common/v8_converters/string16_converter.h"
+#include <string>
+
+#include "atom/common/native_mate_converters/string16_converter.h"
 #include "base/files/file_path.h"
 
 namespace mate {
@@ -20,7 +22,7 @@ struct Converter<base::FilePath> {
                      v8::Handle<v8::Value> val,
                      base::FilePath* out) {
     base::FilePath::StringType path;
-    if (Converter<std::string>::FromV8(isolate, val, &path)) {
+    if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
       *out = base::FilePath(path);
       return true;
     } else {
@@ -31,4 +33,4 @@ struct Converter<base::FilePath> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_V8_CONVERTERS_FILE_PATH_CONVERTER_H_
+#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
diff --git a/atom/common/v8_converters/string16_converter.h b/atom/common/native_mate_converters/string16_converter.h
similarity index 80%
rename from atom/common/v8_converters/string16_converter.h
rename to atom/common/native_mate_converters/string16_converter.h
index d891dc00c992..a3b360fd6744 100644
--- a/atom/common/v8_converters/string16_converter.h
+++ b/atom/common/native_mate_converters/string16_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_V8_CONVERTERS_STRING16_CONVERTER_H_
-#define ATOM_COMMON_V8_CONVERTERS_STRING16_CONVERTER_H_
+#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
+#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
 
 #include "base/strings/string16.h"
 #include "native_mate/converter.h"
@@ -28,4 +28,4 @@ struct Converter<string16> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_V8_CONVERTERS_STRING16_CONVERTER_H_
+#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
diff --git a/atom/common/v8/v8_value_converter.cc b/atom/common/native_mate_converters/v8_value_converter.cc
similarity index 99%
rename from atom/common/v8/v8_value_converter.cc
rename to atom/common/native_mate_converters/v8_value_converter.cc
index 7aaef694dadc..2a879155a8be 100644
--- a/atom/common/v8/v8_value_converter.cc
+++ b/atom/common/native_mate_converters/v8_value_converter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/common/v8/v8_value_converter.h"
+#include "atom/common/native_mate_converters/v8_value_converter.h"
 
 #include <string>
 #include <utility>
diff --git a/atom/common/v8/v8_value_converter.h b/atom/common/native_mate_converters/v8_value_converter.h
similarity index 92%
rename from atom/common/v8/v8_value_converter.h
rename to atom/common/native_mate_converters/v8_value_converter.h
index bd25a5880307..06f69b13e41a 100644
--- a/atom/common/v8/v8_value_converter.h
+++ b/atom/common/native_mate_converters/v8_value_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_V8_V8_VALUE_CONVERTER_H_
-#define ATOM_COMMON_V8_V8_VALUE_CONVERTER_H_
+#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
+#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
 
 #include <map>
 
@@ -77,4 +77,4 @@ class V8ValueConverter {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_V8_V8_VALUE_CONVERTER_H_
+#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
diff --git a/atom/common/native_mate_converters/value_converter.cc b/atom/common/native_mate_converters/value_converter.cc
new file mode 100644
index 000000000000..4833630a0ff7
--- /dev/null
+++ b/atom/common/native_mate_converters/value_converter.cc
@@ -0,0 +1,26 @@
+// Copyright (c) 2014 GitHub, Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "atom/common/native_mate_converters/value_converter.h"
+
+#include "atom/common/native_mate_converters/v8_value_converter.h"
+#include "base/values.h"
+
+namespace mate {
+
+bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
+                                        v8::Handle<v8::Value> val,
+                                        base::ListValue* out) {
+  scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
+  scoped_ptr<base::Value> value(converter->FromV8Value(
+      val, v8::Context::GetCurrent()));
+  if (value->IsType(base::Value::TYPE_LIST)) {
+    out->Swap(static_cast<ListValue*>(value.get()));
+    return true;
+  } else {
+    return false;
+  }
+}
+
+}  // namespace mate
diff --git a/atom/common/native_mate_converters/value_converter.h b/atom/common/native_mate_converters/value_converter.h
new file mode 100644
index 000000000000..55a2d767dc95
--- /dev/null
+++ b/atom/common/native_mate_converters/value_converter.h
@@ -0,0 +1,25 @@
+// Copyright (c) 2014 GitHub, Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
+#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
+
+#include "native_mate/converter.h"
+
+namespace base {
+class ListValue;
+}
+
+namespace mate {
+
+template<>
+struct Converter<base::ListValue> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Handle<v8::Value> val,
+                     base::ListValue* out);
+};
+
+}  // namespace mate
+
+#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index a138273c7105..380419b6b7f0 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -18,7 +18,7 @@
 #include "base/strings/utf_string_conversions.h"
 #endif
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 using content::BrowserThread;
 
diff --git a/atom/common/node_bindings_mac.cc b/atom/common/node_bindings_mac.cc
index d918b8e761c8..c791118e0258 100644
--- a/atom/common/node_bindings_mac.cc
+++ b/atom/common/node_bindings_mac.cc
@@ -9,7 +9,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/common/v8/node_common.h b/atom/common/node_includes.h
similarity index 85%
rename from atom/common/v8/node_common.h
rename to atom/common/node_includes.h
index 88a7505f37ce..8dc395703ede 100644
--- a/atom/common/v8/node_common.h
+++ b/atom/common/node_includes.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_V8_NODE_COMMON_H_
-#define ATOM_COMMON_V8_NODE_COMMON_H_
+#ifndef ATOM_COMMON_NODE_INCLUDES_H_
+#define ATOM_COMMON_NODE_INCLUDES_H_
 
 // Include common headers for using node APIs.
 
@@ -24,4 +24,4 @@ namespace atom {
 extern node::Environment* global_env;
 }
 
-#endif  // ATOM_COMMON_V8_NODE_COMMON_H_
+#endif  // ATOM_COMMON_NODE_INCLUDES_H_
diff --git a/atom/common/v8/native_type_conversions.h b/atom/common/v8/native_type_conversions.h
index fbe615b3f901..e7c4c73a4e63 100644
--- a/atom/common/v8/native_type_conversions.h
+++ b/atom/common/v8/native_type_conversions.h
@@ -12,7 +12,7 @@
 #include "atom/browser/api/atom_api_window.h"
 #include "atom/common/swap_or_assign.h"
 #include "atom/common/v8/scoped_persistent.h"
-#include "atom/common/v8/v8_value_converter.h"
+#include "atom/common/native_mate_converters/v8_value_converter.h"
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/template_util.h"
diff --git a/atom/renderer/api/atom_api_renderer_ipc.cc b/atom/renderer/api/atom_api_renderer_ipc.cc
index c93d8a0a3bbc..885a764bf944 100644
--- a/atom/renderer/api/atom_api_renderer_ipc.cc
+++ b/atom/renderer/api/atom_api_renderer_ipc.cc
@@ -3,40 +3,19 @@
 // found in the LICENSE file.
 
 #include "atom/common/api/api_messages.h"
-#include "atom/common/v8/v8_value_converter.h"
-#include "atom/common/v8_converters/string16_converter.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/native_mate_converters/value_converter.h"
 #include "content/public/renderer/render_view.h"
 #include "native_mate/dictionary.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 using content::RenderView;
 using WebKit::WebFrame;
 using WebKit::WebView;
 
-namespace mate {
-
-template<>
-struct Converter<base::ListValue> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Handle<v8::Value> val,
-                     base::ListValue* out) {
-    scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
-    scoped_ptr<base::Value> value(converter->FromV8Value(
-        val, v8::Context::GetCurrent()));
-    if (value->IsType(base::Value::TYPE_LIST)) {
-      out->Swap(static_cast<ListValue*>(value.get()));
-      return true;
-    } else {
-      return false;
-    }
-  }
-};
-
-}  // namespace mate
-
 namespace {
 
 RenderView* GetCurrentRenderView() {
diff --git a/atom/renderer/api/atom_renderer_bindings.cc b/atom/renderer/api/atom_renderer_bindings.cc
index c35b64f6d5f8..1e2926ea96c6 100644
--- a/atom/renderer/api/atom_renderer_bindings.cc
+++ b/atom/renderer/api/atom_renderer_bindings.cc
@@ -11,7 +11,7 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {
 
diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc
index 734a6033605c..6541f7c235b6 100644
--- a/atom/renderer/atom_render_view_observer.cc
+++ b/atom/renderer/atom_render_view_observer.cc
@@ -16,7 +16,7 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 using WebKit::WebFrame;
 
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 0b8c474076f2..e7e29ecf67ea 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -15,7 +15,7 @@
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 
-#include "atom/common/v8/node_common.h"
+#include "atom/common/node_includes.h"
 
 namespace atom {