diff --git a/handlers/views_handler_area_text.inc b/handlers/views_handler_area_text.inc
index 29c4aa1..1aa34bb 100644
--- a/handlers/views_handler_area_text.inc
+++ b/handlers/views_handler_area_text.inc
@@ -80,7 +80,7 @@ class views_handler_area_text extends views_handler_area {
     }
   }
 
-  function options_submit(&$form, &$form_state) {
+  function options_submit($form, &$form_state) {
     $form_state['values']['options']['format'] = $form_state['values']['format'];
     parent::options_submit($form, $form_state);
   }
diff --git a/handlers/views_handler_argument.inc b/handlers/views_handler_argument.inc
index 5bdc7f5..44dac09 100644
--- a/handlers/views_handler_argument.inc
+++ b/handlers/views_handler_argument.inc
@@ -111,7 +111,7 @@ class views_handler_argument extends views_handler {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  function options_form($form, &$form_state) {
     parent::options_form($form, $form_state);
     $defaults = $this->default_actions();
 
diff --git a/handlers/views_handler_field_serialized.inc b/handlers/views_handler_field_serialized.inc
index e2931e6..4f9ac60 100644
--- a/handlers/views_handler_field_serialized.inc
+++ b/handlers/views_handler_field_serialized.inc
@@ -1,7 +1,7 @@
 <?php
 
 class views_handler_field_serialized extends views_handler_field {
-  
+
   function option_definition() {
     $options = parent::option_definition();
     $options['format'] = array('default' => 'unserialized');
@@ -10,7 +10,7 @@ class views_handler_field_serialized extends views_handler_field {
   }
 
 
-  function options_form(&$form, &$form_state) {
+  function options_form($form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['format'] = array(
diff --git a/handlers/views_handler_sort.inc b/handlers/views_handler_sort.inc
index 3f87a6a..c0c93c7 100644
--- a/handlers/views_handler_sort.inc
+++ b/handlers/views_handler_sort.inc
@@ -60,7 +60,7 @@ class views_handler_sort extends views_handler {
   /**
    * Basic options for all sort criteria
    */
-  function options_form(&$form, &$form_state) {
+  function options_form($form, &$form_state) {
     parent::options_form($form, $form_state);
     if ($this->can_expose()) {
       $this->show_expose_button($form, $form_state);
@@ -87,7 +87,7 @@ class views_handler_sort extends views_handler {
   /**
    * Simple submit handler
    */
-  function options_submit(&$form, &$form_state) {
+  function options_submit($form, &$form_state) {
     unset($form_state['values']['expose_button']); // don't store this.
     $this->sort_submit($form, $form_state);
     if (!empty($this->options['exposed'])) {
@@ -117,17 +117,17 @@ class views_handler_sort extends views_handler {
    * Provide a list of options for the default sort form.
    * Should be overridden by classes that don't override sort_form
    */
-  function sort_options() { 
+  function sort_options() {
     return array(
-      'ASC' => t('Sort ascending'), 
+      'ASC' => t('Sort ascending'),
       'DESC' => t('Sort descending'),
-    ); 
+    );
   }
 
   /**
    * Since all exposed sorts are grouped into one select box.
    * We don't return nothing when views call to exposed_form()
-   */ 
+   */
   function exposed_form(&$form, &$form_state) { }
 
   /**
@@ -142,7 +142,7 @@ class views_handler_sort extends views_handler {
       '#size' => 40,
    );
   }
-  
+
   /**
    * Handle the 'right' side fo the exposed options form.
    */
diff --git a/includes/base.inc b/includes/base.inc
index 5951c43..b7d3e57 100644
--- a/includes/base.inc
+++ b/includes/base.inc
@@ -13,14 +13,14 @@ class views_object {
    * Except for displays, options for the object will be held here.
    */
   var $options = array();
-  
+
   /**
    * The top object of a view.
-   * 
+   *
    * @var view
    */
   var $view = NULL;
-  
+
   /**
    * Handler's definition
    *
diff --git a/includes/handlers.inc b/includes/handlers.inc
index 7f59c0b..2cf9b66 100644
--- a/includes/handlers.inc
+++ b/includes/handlers.inc
@@ -416,7 +416,7 @@ class views_handler extends views_object {
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) { }
+  function options_validate(&$form, &$form_state) { }
 
   function options_form(&$form, &$form_state) {
     $form['ui_name'] = array(
diff --git a/modules/comment/views_handler_field_comment_username.inc b/modules/comment/views_handler_field_comment_username.inc
index 418ae8c..3764d7b 100644
--- a/modules/comment/views_handler_field_comment_username.inc
+++ b/modules/comment/views_handler_field_comment_username.inc
@@ -6,7 +6,7 @@ class views_handler_field_comment_username extends views_handler_field {
   /**
    * Override init function to add uid and homepage fields.
    */
-  function init(&$view, &$data) {
+  function init(&$view, $data) {
     parent::init($view, $data);
     $this->additional_fields['uid'] = 'uid';
     $this->additional_fields['homepage'] = 'homepage';
diff --git a/modules/node/views_handler_filter_node_access.inc b/modules/node/views_handler_filter_node_access.inc
index f787aee..010a286 100644
--- a/modules/node/views_handler_filter_node_access.inc
+++ b/modules/node/views_handler_filter_node_access.inc
@@ -4,7 +4,7 @@
  */
 class views_handler_filter_node_access extends views_handler_filter {
   function admin_summary() { }
-  function operator_form() { }
+  function operator_form(&$form, &$form_state) { }
   function can_expose() {
     return FALSE;
   }
diff --git a/modules/node/views_handler_filter_node_status.inc b/modules/node/views_handler_filter_node_status.inc
index 7047caa..a91b5c6 100644
--- a/modules/node/views_handler_filter_node_status.inc
+++ b/modules/node/views_handler_filter_node_status.inc
@@ -4,7 +4,7 @@
  */
 class views_handler_filter_node_status extends views_handler_filter {
   function admin_summary() { }
-  function operator_form() { }
+  function operator_form(&$form, &$form_state) { }
 
   function query() {
     $table = $this->ensure_my_table();
diff --git a/modules/user/views_handler_field_user.inc b/modules/user/views_handler_field_user.inc
index 279d094..42a5aa3 100644
--- a/modules/user/views_handler_field_user.inc
+++ b/modules/user/views_handler_field_user.inc
@@ -7,7 +7,7 @@ class views_handler_field_user extends views_handler_field {
   /**
    * Override init function to provide generic option to link to user.
    */
-  function init(&$view, &$data) {
+  function init(&$view, $data) {
     parent::init($view, $data);
     if (!empty($this->options['link_to_user'])) {
       $this->additional_fields['uid'] = 'uid';
diff --git a/modules/user/views_handler_field_user_name.inc b/modules/user/views_handler_field_user_name.inc
index d753f25..ba01929 100644
--- a/modules/user/views_handler_field_user_name.inc
+++ b/modules/user/views_handler_field_user_name.inc
@@ -6,7 +6,7 @@ class views_handler_field_user_name extends views_handler_field_user {
   /**
    * Add uid in the query so we can test for anonymous if needed.
    */
-  function init(&$view, &$data) {
+  function init(&$view, $data) {
     parent::init($view, $data);
     if (!empty($this->options['overwrite_anonymous'])) {
       $this->additional_fields['uid'] = 'uid';
diff --git a/plugins/views_plugin_row.inc b/plugins/views_plugin_row.inc
index 3d1ff0b..1225006 100644
--- a/plugins/views_plugin_row.inc
+++ b/plugins/views_plugin_row.inc
@@ -98,13 +98,13 @@ class views_plugin_row extends views_plugin {
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) { }
+  function options_validate(&$form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) { }
+  function options_submit(&$form, &$form_state) { }
 
   function query() {
     if (isset($this->base_table)) {
diff --git a/plugins/views_plugin_row_fields.inc b/plugins/views_plugin_row_fields.inc
index 83f1aa1..565f6b9 100644
--- a/plugins/views_plugin_row_fields.inc
+++ b/plugins/views_plugin_row_fields.inc
@@ -76,7 +76,7 @@ class views_plugin_row_fields extends views_plugin_row {
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) {
+  function options_submit(&$form, &$form_state) {
     $form_state['values']['row_options']['inline'] = array_filter($form_state['values']['row_options']['inline']);
   }
 }