diff --git a/Shorewall-common/lib.base b/Shorewall-common/lib.base
index 5cd4af1b3..6fdecc946 100644
--- a/Shorewall-common/lib.base
+++ b/Shorewall-common/lib.base
@@ -811,7 +811,11 @@ find_interface_by_address() {
 
 find_interface_by_mac() {
     local mac
-    mac=$1 first second rest dev
+    mac=$1 
+    local first 
+    local second
+    local rest
+    local dev
 
     ip link list | while read first second rest; do
 	case $first in
diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index b60654526..fef631229 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -1300,7 +1300,15 @@ reload_command() # $* = original arguments less the command.
 export_command() # $* = original arguments less the command.
 {
     local verbose
-    verbose=$(make_verbose) file= finished=0 directory target compiler=
+    verbose=$(make_verbose) 
+    local file
+    file= 
+    local finished
+    finished=0 
+    local directory 
+    local target
+    local compiler
+    compiler=
 
     while [ $finished -eq 0 -a $# -gt 0 ]; do
 	option=$1