diff --git a/bin/ramdisk-image-create b/bin/ramdisk-image-create
index 622734725..ea8f663cd 100755
--- a/bin/ramdisk-image-create
+++ b/bin/ramdisk-image-create
@@ -56,6 +56,7 @@ for arg do RAMDISK_ELEMENT="$RAMDISK_ELEMENT $arg" ; done
 
 source $_LIB/ramdisk-defaults
 source $_LIB/common-functions
+source $_LIB/img-functions
 source $_LIB/ramdisk-functions
 
 RAMDISK_ELEMENT=$($SCRIPT_HOME/element-info --expand-dependencies $RAMDISK_ELEMENT)
diff --git a/lib/common-functions b/lib/common-functions
index 1cbf4ce85..37cb723b0 100644
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -13,8 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-source $(dirname $(readlink -f $BASH_SOURCE))/img-functions
-
 function mk_build_dir () {
   export TMP_BUILD_DIR=$(mktemp -t -d --tmpdir=${TMP_DIR:-/tmp} image.XXXXXXXX)
   [ $? -eq 0 ] || die "Failed to create tmp directory"