diff --git a/includes/admin.inc b/includes/admin.inc
index c351978..f57ea24 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -4693,7 +4693,9 @@ function views_ui_get_roles() {
   static $roles = NULL;
   if (!isset($roles)) {
     $roles = array();
-    $result = db_query("SELECT r.rid, r.name FROM {role} r ORDER BY r.name");
+    // This db_query is not becoming a db_select as it is static and passes no
+    // variables.
+    $result = $result = db_query("SELECT r.rid, r.name FROM {role} r ORDER BY r.name");
     foreach ($result as $obj) {
       $roles[$obj->rid] = $obj->name;
     }
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index 80d7d94..6ec0a1c 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -1833,8 +1833,12 @@ class View extends ViewsDbObject {
     foreach (View::db_objects() as $key => $object) {
       $table_name = "views_" . $key;
       $object_name = "Views$object";
-      $result = db_query("SELECT * FROM {{$table_name}} WHERE vid IN (:vids) ORDER BY vid, position",
-        array(':vids' => array_keys($names)));
+      $result = db_select($table_name, $key)
+        ->fields($key)
+        ->condition('vid', array_keys($names))
+        ->orderBy('vid')
+        ->orderBy('position')
+        ->execute();
 
       foreach ($result as $data) {
         $object = new $object_name(FALSE);
@@ -1867,7 +1871,10 @@ class View extends ViewsDbObject {
     }
     // If there is no vid, check if a view with this machine name already exists.
     elseif (empty($this->vid)) {
-      $vid = db_query("SELECT vid from {views_view} WHERE name = :name", array(':name' => $this->name))->fetchField();
+      $query = db_select('views_view', 'v');
+      $query->addField('v', 'vid');
+      $query->condition('name', $this->name);
+      $vid = $query->execute()->fetchField();
       $this->vid = $vid ? $vid : NULL;
     }
 
diff --git a/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
index 22a9a41..26cf7b1 100644
--- a/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
+++ b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
@@ -28,8 +28,9 @@ class CategoryCid extends InOperator {
     }
 
     $this->value_options = array();
-
-    $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title');
+    // This db_query is not becoming a db_select as it is static and passes no
+    // variables.
+    $result = $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title');
     foreach ($result as $category) {
       $this->value_options[$category->cid] = $category->title;
     }
diff --git a/lib/Views/aggregator/Plugin/views/row/Rss.php b/lib/Views/aggregator/Plugin/views/row/Rss.php
index 9ffaaba..0ff1c58 100644
--- a/lib/Views/aggregator/Plugin/views/row/Rss.php
+++ b/lib/Views/aggregator/Plugin/views/row/Rss.php
@@ -52,12 +52,12 @@ class Rss extends RowPluginBase {
 
   function render($row) {
     $iid =  $row->{$this->field_alias};
-    $sql =  "SELECT ai.iid, ai.fid, ai.title, ai.link, ai.author, ai.description, ";
-    $sql .= "ai.timestamp, ai.guid, af.title AS feed_title, ai.link AS feed_LINK ";
-    $sql .= "FROM {aggregator_item} ai LEFT JOIN {aggregator_feed} af ON ai.fid = af.fid ";
-    $sql .= "WHERE ai.iid = :iid";
-
-    $item = db_query($sql, array(':iid' => $iid))->fetchObject();
+    $query = db_select('aggregator_item', 'ai');
+    $query->leftJoin('aggregator_feed', 'af', 'ai.fid = af.fid');
+    $query->fields('ai', array('iid', 'fid', 'title', 'link', 'author', 'description', 'timestamp', 'guid'));
+    $query->addField('af', 'title');
+    $query->condition('iid', $iid);
+    $result = $query->execute();
 
     $item->elements = array(
       array(
diff --git a/lib/Views/user/Plugin/views/argument_validator/User.php b/lib/Views/user/Plugin/views/argument_validator/User.php
index 5f0df2b..be2270a 100644
--- a/lib/Views/user/Plugin/views/argument_validator/User.php
+++ b/lib/Views/user/Plugin/views/argument_validator/User.php
@@ -85,7 +85,7 @@ class User extends ArgumentValidatorPluginBase {
           // real global $user object.
           $account = clone $GLOBALS['user'];
         }
-        $where = 'uid = :argument';
+        $where = 'uid';
       }
     }
     else {
@@ -94,7 +94,7 @@ class User extends ArgumentValidatorPluginBase {
         if ($argument == $name) {
           $account = clone $GLOBALS['user'];
         }
-        $where = "name = :argument";
+        $where = 'name';
       }
     }
 
@@ -104,8 +104,11 @@ class User extends ArgumentValidatorPluginBase {
     }
 
     if (!isset($account)) {
-      $query = "SELECT uid, name FROM {users} WHERE $where";
-      $account = db_query($query, array(':argument' => $argument))->fetchObject();
+      $account = db_select('users', 'u')
+        ->fields('u', array('uid', 'name'))
+        ->condition($where, $argument)
+        ->execute()
+        ->fetchObject();
     }
     if (empty($account)) {
       // User not found.
diff --git a/lib/Views/user/Plugin/views/field/Permissions.php b/lib/Views/user/Plugin/views/field/Permissions.php
index 2a9ab03..d8e4cd7 100644
--- a/lib/Views/user/Plugin/views/field/Permissions.php
+++ b/lib/Views/user/Plugin/views/field/Permissions.php
@@ -52,8 +52,14 @@ class Permissions extends PrerenderList {
 
       $permissions = module_invoke_all('permission');
 
-      $result = db_query("SELECT u.uid, u.rid, rp.permission FROM {role_permission} rp INNER JOIN {users_roles} u ON u.rid = rp.rid WHERE u.uid IN (:uids) AND rp.module IN (:modules) ORDER BY rp.permission",
-        array(':uids' => $uids, ':modules' => array_keys($modules)));
+      $query = db_select('role_permission', 'rp');
+      $query->join('users_roles', 'u', 'u.rid = rp.rid');
+      $query->fields('u', array('uid', 'rid'));
+      $query->addField('rp', 'permission');
+      $query->condition('u.uid', $uids);
+      $query->condition('rp.module', array_keys($modules));
+      $query->orderBy('rp.permission');
+      $result = $query->execute();
 
       foreach ($result as $perm) {
         $this->items[$perm->uid][$perm->permission]['permission'] = $permissions[$perm->permission]['title'];
diff --git a/lib/Views/user/Plugin/views/field/Roles.php b/lib/Views/user/Plugin/views/field/Roles.php
index 8d06958..d2113dc 100644
--- a/lib/Views/user/Plugin/views/field/Roles.php
+++ b/lib/Views/user/Plugin/views/field/Roles.php
@@ -41,8 +41,13 @@ class Roles extends PrerenderList {
     }
 
     if ($uids) {
-      $result = db_query("SELECT u.uid, u.rid, r.name FROM {role} r INNER JOIN {users_roles} u ON u.rid = r.rid WHERE u.uid IN (:uids) ORDER BY r.name",
-        array(':uids' => $uids));
+      $query = db_select('role', 'r');
+      $query->join('users_roles', 'u', 'u.rid = r.rid');
+      $query->addField('r', 'name');
+      $query->fields('u', array('uid', 'rid'));
+      $query->condition('u.uid', $uids);
+      $query->orderBy('r.name');
+      $result = $query->execute();
       foreach ($result as $role) {
         $this->items[$role->uid][$role->rid]['role'] = check_plain($role->name);
         $this->items[$role->uid][$role->rid]['rid'] = $role->rid;
diff --git a/lib/Views/user/Plugin/views/filter/Name.php b/lib/Views/user/Plugin/views/filter/Name.php
index 243bff0..b85f390 100644
--- a/lib/Views/user/Plugin/views/filter/Name.php
+++ b/lib/Views/user/Plugin/views/filter/Name.php
@@ -27,7 +27,7 @@ class Name extends InOperator {
   function value_form(&$form, &$form_state) {
     $values = array();
     if ($this->value) {
-      $result = db_query("SELECT * FROM {users} u WHERE uid IN (:uids)", array(':uids' => $this->value));
+      $result = entity_load_multiple_by_properties('user', array('uid' => $this->value));
       foreach ($result as $account) {
         if ($account->uid) {
           $values[] = $account->name;
@@ -131,7 +131,7 @@ class Name extends InOperator {
       return $uids;
     }
 
-    $result = db_query("SELECT * FROM {users} WHERE name IN (:names)", array(':names' => $args));
+    $result = entity_load_multiple_by_properties('user', array('name' => $args));
     foreach ($result as $account) {
       unset($missing[strtolower($account->name)]);
       $uids[] = $account->uid;
@@ -156,8 +156,7 @@ class Name extends InOperator {
     $this->value_options = array();
 
     if ($this->value) {
-      $result = db_query("SELECT * FROM {users} u WHERE uid IN (:uids)", array(':uids' => $this->value));
-
+      $result = entity_load_multiple_by_properties('user', array('uid' => $this->value));
       foreach ($result as $account) {
         if ($account->uid) {
           $this->value_options[$account->uid] = $account->name;
diff --git a/views.module b/views.module
index b840c02..0d0e2cb 100644
--- a/views.module
+++ b/views.module
@@ -1748,8 +1748,12 @@ function views_load_display_records(&$views) {
   foreach (View::db_objects() as $key => $object) {
     $table_name = "views_" . $key;
     $object_name = 'Drupal\views\Views' . $object;
-    $result = db_query("SELECT * FROM {{$table_name}} WHERE vid IN (:vids) ORDER BY vid, position",
-      array(':vids' => array_keys($names)));
+    $result = db_select($table_name, $key)
+      ->fields($key)
+      ->condition('vid', array_keys($names))
+      ->orderBy('vid')
+      ->orderBy('position')
+      ->execute();
 
     foreach ($result as $data) {
       $object = new $object_name(FALSE);