diff --git a/Shorewall-lite/shorewall b/Shorewall-lite/shorewall
index 9696fa52a..eee7689ac 100755
--- a/Shorewall-lite/shorewall
+++ b/Shorewall-lite/shorewall
@@ -88,10 +88,6 @@
 #
 # Fatal Error
 #
-SHAREDIR=/usr/share/shorewall-lite
-VARDIR=/var/lib/shorewall-lite
-CONFDIR=/etc/shorewall-lite
-
 fatal_error() # $@ = Message
 {
     echo "   $@" >&2
@@ -1174,11 +1170,14 @@ fi
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 MUTEX_TIMEOUT=
 
-SHARED_DIR=${SHAREDIR}
-FIREWALL=$SHARED_DIR/firewall
-FUNCTIONS=$SHARED_DIR/functions
-VERSION_FILE=$SHARED_DIR/version
-HELP=$SHARED_DIR/help
+SHAREDIR=/usr/share/shorewall-lite
+VARDIR=/var/lib/shorewall-lite
+CONFDIR=/etc/shorewall-lite
+
+FIREWALL=$SHAREDIR/firewall
+FUNCTIONS=$SHAREDIR/functions
+VERSION_FILE=$SHAREDIR/version
+HELP=$SHAREDIR/help
 
 if [ -f $FUNCTIONS ]; then
     . $FUNCTIONS
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 89fef02cd..fe98c4250 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -40,10 +40,6 @@
 #	    SHOREWALL_DIR                       A directory name was passed to /sbin/shorewall
 #	    VERBOSE                             Standard Shorewall verbosity control.
 
-SHAREDIR=/usr/share/shorewall
-VARDIR=/var/lib/shorewall
-CONFDIR=/etc/shorewall
-
 # Fatal error -- stops the compiler after issuing the error message
 #
 fatal_error() # $* = Error Message
@@ -8598,7 +8594,6 @@ do_initialize() {
     TCP_FLAGS_LOG_LEVEL=
     RFC1918_LOG_LEVEL=
     MARK_IN_FORWARD_CHAIN=
-    SHARED_DIR=${SHAREDIR}
     FUNCTIONS=
     VERSION_FILE=
     LOGFORMAT=
@@ -8641,7 +8636,12 @@ do_initialize() {
     SECTION=ESTABLISHED
     SECTIONS=
     ALL_PORTS=
-    FUNCTIONS=$SHARED_DIR/functions
+
+    SHAREDIR=/usr/share/shorewall
+    VARDIR=/var/lib/shorewall
+    CONFDIR=/etc/shorewall
+
+    FUNCTIONS=${SHAREDIR}/functions
 
     [ -n "${VERBOSE:=2}" ]
 
diff --git a/Shorewall/firewall b/Shorewall/firewall
index f7d22246c..e303064c8 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -40,9 +40,6 @@
 #						  and rules/policies.
 #	   shorewall refresh	.		  Rebuild the common chain
 #
-SHAREDIR=/usr/share/shorewall
-VARDIR=/var/lib/shorewall
-CONFDIR=/etc/shorewall
 # Mutual exclusion -- These functions are jackets for the mutual exclusion
 #		      routines in $FUNCTIONS. They invoke
 #		      the corresponding function in that file if the user did
@@ -2298,7 +2295,6 @@ do_initialize() {
     TCP_FLAGS_LOG_LEVEL=
     RFC1918_LOG_LEVEL=
     MARK_IN_FORWARD_CHAIN=
-    SHARED_DIR=${SHAREDIR}
     FUNCTIONS=
     VERSION_FILE=
     LOGFORMAT=
@@ -2341,7 +2337,11 @@ do_initialize() {
     SECTIONS=
     ALL_PORTS=
 
-    FUNCTIONS=$SHARED_DIR/functions
+    SHAREDIR=/usr/share/shorewall
+    VARDIR=/var/lib/shorewall
+    CONFDIR=/etc/shorewall
+    
+    FUNCTIONS=${SHAREDIR}/functions
 
     if [ -f $FUNCTIONS ]; then
 	[ $VERBOSE -gt 1 ] && echo "Loading $FUNCTIONS..."
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 076379a45..0f051a902 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -113,10 +113,6 @@
 #          shorewall compile [ <directory> ] ]<filename>
 #                                                  Compile a firewall program file.
 #
-SHAREDIR=/usr/share/shorewall
-VARDIR=/var/lib/shorewall
-CONFDIR=/etc/shorewall
-
 # Fatal Error
 #
 fatal_error() # $@ = Message
@@ -1516,11 +1512,14 @@ fi
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 MUTEX_TIMEOUT=
 
-SHARED_DIR=${SHAREDIR}
-FIREWALL=$SHARED_DIR/firewall
-FUNCTIONS=$SHARED_DIR/functions
-VERSION_FILE=$SHARED_DIR/version
-HELP=$SHARED_DIR/help
+SHAREDIR=/usr/share/shorewall
+VARDIR=/var/lib/shorewall
+CONFDIR=/etc/shorewall
+
+FIREWALL=$SHAREDIR/firewall
+FUNCTIONS=$SHAREDIR/functions
+VERSION_FILE=$SHAREDIR/version
+HELP=$SHAREDIR/help
 
 if [ -f $FUNCTIONS ]; then
     . $FUNCTIONS