diff --git a/broadcast-message.php b/broadcast-message.php
index 5b10e918..0c6bf7ef 100644
--- a/broadcast-message.php
+++ b/broadcast-message.php
@@ -34,6 +34,8 @@ if ($CONF['sendmail'] != 'YES') {
    exit;
 }
 
+$error = 0;
+
 $smtp_from_email = smtp_get_admin_email();
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
diff --git a/common.php b/common.php
index 28bea047..6425d377 100644
--- a/common.php
+++ b/common.php
@@ -60,8 +60,6 @@ function postfixadmin_autoload($class) {
 }
 spl_autoload_register('postfixadmin_autoload');
 
-require_once("$incpath/variables.inc.php");
-
 if(!is_file("$incpath/config.inc.php")) {
     die("config.inc.php is missing!");
 }
diff --git a/list-virtual.php b/list-virtual.php
index e1028576..0e41c4d8 100644
--- a/list-virtual.php
+++ b/list-virtual.php
@@ -212,17 +212,18 @@ $query = "$sql_select\n$mailbox_pagebrowser_query\n$sql_limit";
 
 $result = db_query ($query);
 
+$tMailbox = array();
+
 if ($result['rows'] > 0) {
     $delimiter = preg_quote($CONF['recipient_delimiter'], "/");
     $goto_single_rec_del = "";
 
-    $tMailbox = array();
     while ($row = db_array ($result['result'])) {
         if ($display_mailbox_aliases) {
             $goto_split = explode(",", $row['goto']);
             $row['goto_mailbox'] = 0;
             $row['goto_other'] = array();
-            
+
             foreach ($goto_split as $goto_single) {
                 if (!empty($CONF['recipient_delimiter'])) {
                     $goto_single_rec_del = preg_replace('/' .$delimiter. '[^' .$delimiter. '@]*@/', "@", $goto_single);
diff --git a/sendmail.php b/sendmail.php
index bb5e3e7c..c4b1a1db 100644
--- a/sendmail.php
+++ b/sendmail.php
@@ -51,6 +51,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       $tBody = stripslashes($tBody); # TODO: check for get_magic_quotes_gpc inside safepost/safeget
    }
 
+   $error = 0;
    $email_check = check_email ($fTo);
    if (empty ($fTo) or ($email_check != ''))
    {
diff --git a/vacation.php b/vacation.php
index a4212d3c..0aaaf900 100644
--- a/vacation.php
+++ b/vacation.php
@@ -67,6 +67,8 @@ if($CONF['vacation'] == 'NO') {
 
 date_default_timezone_set(@date_default_timezone_get()); # Suppress date.timezone warnings
 
+$error = 0;
+
 $vh = new VacationHandler($fUsername);
 
 $choice_of_reply = Config::read('vacation_choice_of_reply');
diff --git a/variables.inc.php b/variables.inc.php
deleted file mode 100644
index a04671bc..00000000
--- a/variables.inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: variables.inc.php
- * Contains varoius pre-defined variables. 
- *
- * XXX Probably a hack to save having to declare variables before using them in pages.
- *
- * TODO: get rid of the remaining variables declared here!
- */
-
-$error = "";
-$fPassword = "";
-$fWhere = "";
-$tAlias = "";
-$tDescription = "";
-$tMailbox = "";
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
diff --git a/viewlog.php b/viewlog.php
index 50be3b56..287baa25 100644
--- a/viewlog.php
+++ b/viewlog.php
@@ -37,6 +37,8 @@ else {
 }
 
 $fDomain = '';
+$error = 0;
+
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
    if ((is_array ($list_domains) and sizeof ($list_domains) > 0)) $fDomain = $list_domains[0];