diff --git a/include/functions.inc b/include/functions.inc
index bcceda39f769e4694c000a5bb08ec06c8380a1ec..bbb1037d19b219075823fb317c88e6887ab7d6fe 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -23,22 +23,6 @@
 /*! \file
  * Common functions and named definitions. */
 
-/* Configuration file location */
-if(!isset($_SERVER['CONFIG_DIR'])){
-  define ("CONFIG_DIR", "/etc/fusiondirectory");
-}else{
-  define ("CONFIG_DIR",$_SERVER['CONFIG_DIR']);
-}
-
-/* Allow setting the config file in the apache configuration
-    e.g.  SetEnv CONFIG_FILE fusiondirectory.conf 1.0
- */
-if(!isset($_SERVER['CONFIG_FILE'])){
-  define ("CONFIG_FILE", "fusiondirectory.conf");
-}else{
-  define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
-}
-
 /* Define common locations and variables */
 require_once ("variables.inc");
 
diff --git a/include/variables.inc b/include/variables.inc
index 2a10e61ed774d9b74c704281d2b94c76097801af..559cee3ec7d44ca709b3cfdb367df3ca054dc0d3 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -22,6 +22,24 @@
 
 /* Define common locations and variables */
 
+/* Allow setting the config file in the apache configuration
+    e.g. SetEnv CONFIG_DIR /etc/fusiondirectory
+*/
+if(!isset($_SERVER['CONFIG_DIR'])){
+  define ("CONFIG_DIR", "/etc/fusiondirectory");
+}else{
+  define ("CONFIG_DIR",$_SERVER['CONFIG_DIR']);
+}
+
+/* Allow setting the config file in the apache configuration
+    e.g.  SetEnv CONFIG_FILE fusiondirectory.conf 1.0
+ */
+if(!isset($_SERVER['CONFIG_FILE'])){
+  define ("CONFIG_FILE", "fusiondirectory.conf");
+}else{
+  define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
+}
+
 /* Smarty compile dir */
 define ("SPOOL_DIR","/var/spool/fusiondirectory");
 
@@ -53,4 +71,4 @@ define("SMARTY3", "/usr/share/php/smarty3/Smarty.class.php");
 /* name of the class.cache file */
 define("CLASS_CACHE", "class.cache");
 
-?>
\ No newline at end of file
+?>