diff --git a/ChangeLog b/ChangeLog
index 507cadfeb..c04073cb2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ $Source$
     * css/phpmyadmin.css.php: Do not use common header file, as there is
       nothing common at all.
     * libraries/header_http.inc.php: Allways send text/html content type.
+    * libraries/db_table_exists.lib.php, libraries/header_http.inc.php,
+      transformation_wrapper.php: Use define rather than variable for
+      conditional paths.
 
 2005-11-14 Michal Čihař  <michal@cihar.com>
     * libraries/sql_query_form.lib.php: Fix %f expansion (bug #1355776).
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
index 8c0d53e55..a5a7aaf97 100644
--- a/libraries/db_table_exists.lib.php
+++ b/libraries/db_table_exists.lib.php
@@ -12,7 +12,7 @@ if (!isset($is_db) || !$is_db) {
         $is_db = @PMA_DBI_select_db($db);
     }
     if (empty($db) || !$is_db) {
-        if (!isset($is_transformation_wrapper)) {
+        if (!defined('IS_TRANSFORMATION_WRAPPER')) {
             PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         }
         exit;
@@ -26,7 +26,7 @@ if (!isset($is_table) || !$is_table) {
     if (empty($table)
         || !($is_table && @PMA_DBI_num_rows($is_table))) {
         $redirect = TRUE;
-        if (!isset($is_transformation_wrapper)) {
+        if (!defined('IS_TRANSFORMATION_WRAPPER')) {
             $redirect = TRUE;
             if (!empty($table)) {
                 PMA_DBI_free_result($is_table);
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index d3b3e869a..60130012a 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -10,7 +10,7 @@ header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
 header('Last-Modified: ' . $GLOBALS['now']);
 header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 header('Pragma: no-cache'); // HTTP/1.0
-if (!isset($is_transformation_wrapper)) {
+if (!defined('IS_TRANSFORMATION_WRAPPER')) {
     // Define the charset to be used
     header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
 }
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 0af1c5b3a..e2a993219 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -2,7 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-$is_transformation_wrapper = true;
+define('IS_TRANSFORMATION_WRAPPER', true);
 
 /**
  * Get the variables sent or posted to this script and displays the header