diff --git a/includes/plugins.inc b/includes/plugins.inc
index 44f6016407a0c6ce0878442ecdb7496190247893..a6a2720ca00c16cf3f4c798654ab41c3f78c4888 100644
--- a/includes/plugins.inc
+++ b/includes/plugins.inc
@@ -445,9 +445,9 @@ function views_discover_plugins() {
         if (!isset($def['path'])) {
           $def['path'] = $path;
         }
-        if (!isset($def['file'])) {
-          $def['file'] = $def['handler'] . '.inc';
-        }
+//        if (!isset($def['file'])) {
+//          $def['file'] = $def['handler'] . '.inc';
+//        }
         if (!isset($def['parent'])) {
           $def['parent'] = 'parent';
         }
diff --git a/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.inc b/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
similarity index 100%
rename from lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.inc
rename to lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index bed14f7014c1800c856162c74892126fc2a23e98..6de7a8dcb90e511cccb4cf5f4d45d0f680dd6fd3 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -579,8 +579,7 @@ function init_style() {
       $this->style_options = $this->display_handler->get_option('style_options');
     }
 
-    $style_manager = new StylePluginManager();
-    $this->style_plugin = $style_manager->createInstance($this->plugin_name);
+    $this->style_plugin = views_get_plugin('style', $this->plugin_name);
 
     if (empty($this->style_plugin)) {
       return FALSE;
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 11faa15baa71da1437d82be233462ffb0d6c30bc..4bdbac453bc66d0ec297fb9666d9b759f2943e43 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -634,7 +634,7 @@ function node_views_plugins() {
       'node' => array(
         'title' => t('Content'),
         'help' => t('Display the content with standard node view.'),
-        'handler' => 'views_plugin_row_node_view',
+        'class' => 'views_plugin_row_node_view',
         'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
         'base' => array('node'), // only works with 'node' as base.
         'uses options' => TRUE,
@@ -644,7 +644,7 @@ function node_views_plugins() {
       'node_rss' => array(
         'title' => t('Content'),
         'help' => t('Display the content with standard node view.'),
-        'handler' => 'views_plugin_row_node_rss',
+        'class' => 'views_plugin_row_node_rss',
         'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
         'theme' => 'views_view_row_rss',
         'base' => array('node'), // only works with 'node' as base.
diff --git a/modules/node/views_plugin_row_node_rss.inc b/modules/node/views_plugin_row_node_rss.inc
index b0161c5c834191fcb2436c1d76ff9b6105292a82..662dc6407b8324f6a96a14e024768b50c6463867 100644
--- a/modules/node/views_plugin_row_node_rss.inc
+++ b/modules/node/views_plugin_row_node_rss.inc
@@ -5,11 +5,13 @@
  * Contains the node RSS row style plugin.
  */
 
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
 /**
  * Plugin which performs a node_view on the resulting object
  * and formats it as an RSS item.
  */
-class views_plugin_row_node_rss extends views_plugin_row {
+class views_plugin_row_node_rss extends RowPluginBase {
   // Basic properties that let the row style follow relationships.
   var $base_table = 'node';
   var $base_field = 'nid';
diff --git a/modules/node/views_plugin_row_node_view.inc b/modules/node/views_plugin_row_node_view.inc
index 6060aa9d62c66350c1f9ff69184ce09cc694cc12..1ae2008a5b2ba605f914ae7ed74fcae6ba050221 100644
--- a/modules/node/views_plugin_row_node_view.inc
+++ b/modules/node/views_plugin_row_node_view.inc
@@ -5,6 +5,8 @@
  * Contains the node view row style plugin.
  */
 
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
 /**
  * Plugin which performs a node_view on the resulting object.
  *
@@ -12,7 +14,7 @@
  *
  * @ingroup views_row_plugins
  */
-class views_plugin_row_node_view extends views_plugin_row {
+class views_plugin_row_node_view extends RowPluginBase {
   // Basic properties that let the row style follow relationships.
   var $base_table = 'node';
   var $base_field = 'nid';