diff --git a/ldap/ldap-sdk.mozbuild b/ldap/c-sdk/common.mozbuild
similarity index 100%
rename from ldap/ldap-sdk.mozbuild
rename to ldap/c-sdk/common.mozbuild
diff --git a/ldap/c-sdk/libraries/liblber/bprint.c b/ldap/c-sdk/liblber/bprint.c
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/bprint.c
rename to ldap/c-sdk/liblber/bprint.c
diff --git a/ldap/c-sdk/libraries/liblber/decode.c b/ldap/c-sdk/liblber/decode.c
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/decode.c
rename to ldap/c-sdk/liblber/decode.c
diff --git a/ldap/c-sdk/libraries/liblber/dtest.c b/ldap/c-sdk/liblber/dtest.c
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/dtest.c
rename to ldap/c-sdk/liblber/dtest.c
diff --git a/ldap/c-sdk/libraries/liblber/encode.c b/ldap/c-sdk/liblber/encode.c
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/encode.c
rename to ldap/c-sdk/liblber/encode.c
diff --git a/ldap/c-sdk/libraries/liblber/etest.c b/ldap/c-sdk/liblber/etest.c
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/etest.c
rename to ldap/c-sdk/liblber/etest.c
diff --git a/ldap/c-sdk/libraries/liblber/idtest.c b/ldap/c-sdk/liblber/idtest.c
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/idtest.c
rename to ldap/c-sdk/liblber/idtest.c
diff --git a/ldap/c-sdk/libraries/liblber/io.c b/ldap/c-sdk/liblber/io.c
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/io.c
rename to ldap/c-sdk/liblber/io.c
diff --git a/ldap/c-sdk/libraries/liblber/lber-int.h b/ldap/c-sdk/liblber/lber-int.h
similarity index 100%
rename from ldap/c-sdk/libraries/liblber/lber-int.h
rename to ldap/c-sdk/liblber/lber-int.h
diff --git a/ldap/c-sdk/libraries/liblber/moz.build b/ldap/c-sdk/liblber/moz.build
similarity index 86%
rename from ldap/c-sdk/libraries/liblber/moz.build
rename to ldap/c-sdk/liblber/moz.build
index 8a344a4739..d2adf23bf9 100644
--- a/ldap/c-sdk/libraries/liblber/moz.build
+++ b/ldap/c-sdk/liblber/moz.build
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 Library('lber60')
 
@@ -18,6 +18,6 @@ DEFINES['USE_WAITPID'] = True
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 
diff --git a/ldap/c-sdk/libraries/libldap/abandon.c b/ldap/c-sdk/libldap/abandon.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/abandon.c
rename to ldap/c-sdk/libldap/abandon.c
diff --git a/ldap/c-sdk/libraries/libldap/add.c b/ldap/c-sdk/libldap/add.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/add.c
rename to ldap/c-sdk/libldap/add.c
diff --git a/ldap/c-sdk/libraries/libldap/authzidctrl.c b/ldap/c-sdk/libldap/authzidctrl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/authzidctrl.c
rename to ldap/c-sdk/libldap/authzidctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/bind.c b/ldap/c-sdk/libldap/bind.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/bind.c
rename to ldap/c-sdk/libldap/bind.c
diff --git a/ldap/c-sdk/libraries/libldap/cache.c b/ldap/c-sdk/libldap/cache.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/cache.c
rename to ldap/c-sdk/libldap/cache.c
diff --git a/ldap/c-sdk/libraries/libldap/charray.c b/ldap/c-sdk/libldap/charray.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/charray.c
rename to ldap/c-sdk/libldap/charray.c
diff --git a/ldap/c-sdk/libraries/libldap/charset.c b/ldap/c-sdk/libldap/charset.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/charset.c
rename to ldap/c-sdk/libldap/charset.c
diff --git a/ldap/c-sdk/libraries/libldap/cldap.c b/ldap/c-sdk/libldap/cldap.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/cldap.c
rename to ldap/c-sdk/libldap/cldap.c
diff --git a/ldap/c-sdk/libraries/libldap/compare.c b/ldap/c-sdk/libldap/compare.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/compare.c
rename to ldap/c-sdk/libldap/compare.c
diff --git a/ldap/c-sdk/libraries/libldap/compat.c b/ldap/c-sdk/libldap/compat.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/compat.c
rename to ldap/c-sdk/libldap/compat.c
diff --git a/ldap/c-sdk/libraries/libldap/control.c b/ldap/c-sdk/libldap/control.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/control.c
rename to ldap/c-sdk/libldap/control.c
diff --git a/ldap/c-sdk/libraries/libldap/countvalues.c b/ldap/c-sdk/libldap/countvalues.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/countvalues.c
rename to ldap/c-sdk/libldap/countvalues.c
diff --git a/ldap/c-sdk/libraries/libldap/delete.c b/ldap/c-sdk/libldap/delete.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/delete.c
rename to ldap/c-sdk/libldap/delete.c
diff --git a/ldap/c-sdk/libraries/libldap/disptmpl.c b/ldap/c-sdk/libldap/disptmpl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/disptmpl.c
rename to ldap/c-sdk/libldap/disptmpl.c
diff --git a/ldap/c-sdk/libraries/libldap/dllmain.c b/ldap/c-sdk/libldap/dllmain.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/dllmain.c
rename to ldap/c-sdk/libldap/dllmain.c
diff --git a/ldap/c-sdk/libraries/libldap/dsparse.c b/ldap/c-sdk/libldap/dsparse.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/dsparse.c
rename to ldap/c-sdk/libldap/dsparse.c
diff --git a/ldap/c-sdk/libraries/libldap/error.c b/ldap/c-sdk/libldap/error.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/error.c
rename to ldap/c-sdk/libldap/error.c
diff --git a/ldap/c-sdk/libraries/libldap/extendop.c b/ldap/c-sdk/libldap/extendop.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/extendop.c
rename to ldap/c-sdk/libldap/extendop.c
diff --git a/ldap/c-sdk/libraries/libldap/free.c b/ldap/c-sdk/libldap/free.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/free.c
rename to ldap/c-sdk/libldap/free.c
diff --git a/ldap/c-sdk/libraries/libldap/freevalues.c b/ldap/c-sdk/libldap/freevalues.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/freevalues.c
rename to ldap/c-sdk/libldap/freevalues.c
diff --git a/ldap/c-sdk/libraries/libldap/friendly.c b/ldap/c-sdk/libldap/friendly.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/friendly.c
rename to ldap/c-sdk/libldap/friendly.c
diff --git a/ldap/c-sdk/libraries/libldap/getattr.c b/ldap/c-sdk/libldap/getattr.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/getattr.c
rename to ldap/c-sdk/libldap/getattr.c
diff --git a/ldap/c-sdk/libraries/libldap/getdn.c b/ldap/c-sdk/libldap/getdn.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/getdn.c
rename to ldap/c-sdk/libldap/getdn.c
diff --git a/ldap/c-sdk/libraries/libldap/getdxbyname.c b/ldap/c-sdk/libldap/getdxbyname.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/getdxbyname.c
rename to ldap/c-sdk/libldap/getdxbyname.c
diff --git a/ldap/c-sdk/libraries/libldap/geteffectiverightsctrl.c b/ldap/c-sdk/libldap/geteffectiverightsctrl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/geteffectiverightsctrl.c
rename to ldap/c-sdk/libldap/geteffectiverightsctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/getentry.c b/ldap/c-sdk/libldap/getentry.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/getentry.c
rename to ldap/c-sdk/libldap/getentry.c
diff --git a/ldap/c-sdk/libraries/libldap/getfilter.c b/ldap/c-sdk/libldap/getfilter.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/getfilter.c
rename to ldap/c-sdk/libldap/getfilter.c
diff --git a/ldap/c-sdk/libraries/libldap/getoption.c b/ldap/c-sdk/libldap/getoption.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/getoption.c
rename to ldap/c-sdk/libldap/getoption.c
diff --git a/ldap/c-sdk/libraries/libldap/getvalues.c b/ldap/c-sdk/libldap/getvalues.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/getvalues.c
rename to ldap/c-sdk/libldap/getvalues.c
diff --git a/ldap/c-sdk/libraries/libldap/ldap-int.h b/ldap/c-sdk/libldap/ldap-int.h
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/ldap-int.h
rename to ldap/c-sdk/libldap/ldap-int.h
diff --git a/ldap/c-sdk/libraries/libldap/libldap.def b/ldap/c-sdk/libldap/libldap.def
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/libldap.def
rename to ldap/c-sdk/libldap/libldap.def
diff --git a/ldap/c-sdk/libraries/libldap/memcache.c b/ldap/c-sdk/libldap/memcache.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/memcache.c
rename to ldap/c-sdk/libldap/memcache.c
diff --git a/ldap/c-sdk/libraries/libldap/message.c b/ldap/c-sdk/libldap/message.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/message.c
rename to ldap/c-sdk/libldap/message.c
diff --git a/ldap/c-sdk/libraries/libldap/modify.c b/ldap/c-sdk/libldap/modify.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/modify.c
rename to ldap/c-sdk/libldap/modify.c
diff --git a/ldap/c-sdk/libraries/libldap/moz.build b/ldap/c-sdk/libldap/moz.build
similarity index 96%
rename from ldap/c-sdk/libraries/libldap/moz.build
rename to ldap/c-sdk/libldap/moz.build
index 05c7a6b524..35fbd8fb61 100644
--- a/ldap/c-sdk/libraries/libldap/moz.build
+++ b/ldap/c-sdk/libldap/moz.build
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 SharedLibrary('ldap60')
 
@@ -82,7 +82,7 @@ if CONFIG['OS_TARGET'] != 'WINNT':
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 
 USE_LIBS += ['lber60']
diff --git a/ldap/c-sdk/libraries/libldap/mozock.c b/ldap/c-sdk/libldap/mozock.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/mozock.c
rename to ldap/c-sdk/libldap/mozock.c
diff --git a/ldap/c-sdk/libraries/libldap/nsprthreadtest.c b/ldap/c-sdk/libldap/nsprthreadtest.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/nsprthreadtest.c
rename to ldap/c-sdk/libldap/nsprthreadtest.c
diff --git a/ldap/c-sdk/libraries/libldap/open.c b/ldap/c-sdk/libldap/open.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/open.c
rename to ldap/c-sdk/libldap/open.c
diff --git a/ldap/c-sdk/libraries/libldap/os-ip.c b/ldap/c-sdk/libldap/os-ip.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/os-ip.c
rename to ldap/c-sdk/libldap/os-ip.c
diff --git a/ldap/c-sdk/libraries/libldap/proxyauthctrl.c b/ldap/c-sdk/libldap/proxyauthctrl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/proxyauthctrl.c
rename to ldap/c-sdk/libldap/proxyauthctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/psearch.c b/ldap/c-sdk/libldap/psearch.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/psearch.c
rename to ldap/c-sdk/libldap/psearch.c
diff --git a/ldap/c-sdk/libraries/libldap/pthreadtest.c b/ldap/c-sdk/libldap/pthreadtest.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/pthreadtest.c
rename to ldap/c-sdk/libldap/pthreadtest.c
diff --git a/ldap/c-sdk/libraries/libldap/pwmodext.c b/ldap/c-sdk/libldap/pwmodext.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/pwmodext.c
rename to ldap/c-sdk/libldap/pwmodext.c
diff --git a/ldap/c-sdk/libraries/libldap/pwpctrl.c b/ldap/c-sdk/libldap/pwpctrl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/pwpctrl.c
rename to ldap/c-sdk/libldap/pwpctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/referral.c b/ldap/c-sdk/libldap/referral.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/referral.c
rename to ldap/c-sdk/libldap/referral.c
diff --git a/ldap/c-sdk/libraries/libldap/regex.c b/ldap/c-sdk/libldap/regex.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/regex.c
rename to ldap/c-sdk/libldap/regex.c
diff --git a/ldap/c-sdk/libraries/libldap/rename.c b/ldap/c-sdk/libldap/rename.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/rename.c
rename to ldap/c-sdk/libldap/rename.c
diff --git a/ldap/c-sdk/libraries/libldap/request.c b/ldap/c-sdk/libldap/request.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/request.c
rename to ldap/c-sdk/libldap/request.c
diff --git a/ldap/c-sdk/libraries/libldap/reslist.c b/ldap/c-sdk/libldap/reslist.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/reslist.c
rename to ldap/c-sdk/libldap/reslist.c
diff --git a/ldap/c-sdk/libraries/libldap/result.c b/ldap/c-sdk/libldap/result.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/result.c
rename to ldap/c-sdk/libldap/result.c
diff --git a/ldap/c-sdk/libraries/libldap/saslbind.c b/ldap/c-sdk/libldap/saslbind.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/saslbind.c
rename to ldap/c-sdk/libldap/saslbind.c
diff --git a/ldap/c-sdk/libraries/libldap/saslio.c b/ldap/c-sdk/libldap/saslio.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/saslio.c
rename to ldap/c-sdk/libldap/saslio.c
diff --git a/ldap/c-sdk/libraries/libldap/sbind.c b/ldap/c-sdk/libldap/sbind.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/sbind.c
rename to ldap/c-sdk/libldap/sbind.c
diff --git a/ldap/c-sdk/libraries/libldap/search.c b/ldap/c-sdk/libldap/search.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/search.c
rename to ldap/c-sdk/libldap/search.c
diff --git a/ldap/c-sdk/libraries/libldap/setoption.c b/ldap/c-sdk/libldap/setoption.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/setoption.c
rename to ldap/c-sdk/libldap/setoption.c
diff --git a/ldap/c-sdk/libraries/libldap/sort.c b/ldap/c-sdk/libldap/sort.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/sort.c
rename to ldap/c-sdk/libldap/sort.c
diff --git a/ldap/c-sdk/libraries/libldap/sortctrl.c b/ldap/c-sdk/libldap/sortctrl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/sortctrl.c
rename to ldap/c-sdk/libldap/sortctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/srchpref.c b/ldap/c-sdk/libldap/srchpref.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/srchpref.c
rename to ldap/c-sdk/libldap/srchpref.c
diff --git a/ldap/c-sdk/libraries/libldap/test.c b/ldap/c-sdk/libldap/test.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/test.c
rename to ldap/c-sdk/libldap/test.c
diff --git a/ldap/c-sdk/libraries/libldap/tmplout.c b/ldap/c-sdk/libldap/tmplout.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/tmplout.c
rename to ldap/c-sdk/libldap/tmplout.c
diff --git a/ldap/c-sdk/libraries/libldap/tmpltest.c b/ldap/c-sdk/libldap/tmpltest.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/tmpltest.c
rename to ldap/c-sdk/libldap/tmpltest.c
diff --git a/ldap/c-sdk/libraries/libldap/ufn.c b/ldap/c-sdk/libldap/ufn.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/ufn.c
rename to ldap/c-sdk/libldap/ufn.c
diff --git a/ldap/c-sdk/libraries/libldap/unbind.c b/ldap/c-sdk/libldap/unbind.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/unbind.c
rename to ldap/c-sdk/libldap/unbind.c
diff --git a/ldap/c-sdk/libraries/libldap/unescape.c b/ldap/c-sdk/libldap/unescape.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/unescape.c
rename to ldap/c-sdk/libldap/unescape.c
diff --git a/ldap/c-sdk/libraries/libldap/url.c b/ldap/c-sdk/libldap/url.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/url.c
rename to ldap/c-sdk/libldap/url.c
diff --git a/ldap/c-sdk/libraries/libldap/userstatusctrl.c b/ldap/c-sdk/libldap/userstatusctrl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/userstatusctrl.c
rename to ldap/c-sdk/libldap/userstatusctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/utf8.c b/ldap/c-sdk/libldap/utf8.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/utf8.c
rename to ldap/c-sdk/libldap/utf8.c
diff --git a/ldap/c-sdk/libraries/libldap/vlistctrl.c b/ldap/c-sdk/libldap/vlistctrl.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/vlistctrl.c
rename to ldap/c-sdk/libldap/vlistctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/whoami.c b/ldap/c-sdk/libldap/whoami.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldap/whoami.c
rename to ldap/c-sdk/libldap/whoami.c
diff --git a/ldap/c-sdk/libraries/libldif/libldif.def b/ldap/c-sdk/libldif/libldif.def
similarity index 100%
rename from ldap/c-sdk/libraries/libldif/libldif.def
rename to ldap/c-sdk/libldif/libldif.def
diff --git a/ldap/c-sdk/libraries/libldif/line64.c b/ldap/c-sdk/libldif/line64.c
similarity index 100%
rename from ldap/c-sdk/libraries/libldif/line64.c
rename to ldap/c-sdk/libldif/line64.c
diff --git a/ldap/c-sdk/libraries/libldif/moz.build b/ldap/c-sdk/libldif/moz.build
similarity index 87%
rename from ldap/c-sdk/libraries/libldif/moz.build
rename to ldap/c-sdk/libldif/moz.build
index 000775a249..9281f20c4e 100644
--- a/ldap/c-sdk/libraries/libldif/moz.build
+++ b/ldap/c-sdk/libldif/moz.build
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 SharedLibrary('ldif60')
 
@@ -12,7 +12,7 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
diff --git a/ldap/c-sdk/libraries/libprldap/ldappr-dns.c b/ldap/c-sdk/libprldap/ldappr-dns.c
similarity index 100%
rename from ldap/c-sdk/libraries/libprldap/ldappr-dns.c
rename to ldap/c-sdk/libprldap/ldappr-dns.c
diff --git a/ldap/c-sdk/libraries/libprldap/ldappr-error.c b/ldap/c-sdk/libprldap/ldappr-error.c
similarity index 100%
rename from ldap/c-sdk/libraries/libprldap/ldappr-error.c
rename to ldap/c-sdk/libprldap/ldappr-error.c
diff --git a/ldap/c-sdk/libraries/libprldap/ldappr-int.h b/ldap/c-sdk/libprldap/ldappr-int.h
similarity index 100%
rename from ldap/c-sdk/libraries/libprldap/ldappr-int.h
rename to ldap/c-sdk/libprldap/ldappr-int.h
diff --git a/ldap/c-sdk/libraries/libprldap/ldappr-io.c b/ldap/c-sdk/libprldap/ldappr-io.c
similarity index 100%
rename from ldap/c-sdk/libraries/libprldap/ldappr-io.c
rename to ldap/c-sdk/libprldap/ldappr-io.c
diff --git a/ldap/c-sdk/libraries/libprldap/ldappr-public.c b/ldap/c-sdk/libprldap/ldappr-public.c
similarity index 100%
rename from ldap/c-sdk/libraries/libprldap/ldappr-public.c
rename to ldap/c-sdk/libprldap/ldappr-public.c
diff --git a/ldap/c-sdk/libraries/libprldap/ldappr-threads.c b/ldap/c-sdk/libprldap/ldappr-threads.c
similarity index 100%
rename from ldap/c-sdk/libraries/libprldap/ldappr-threads.c
rename to ldap/c-sdk/libprldap/ldappr-threads.c
diff --git a/ldap/c-sdk/libraries/libprldap/libprldap.def b/ldap/c-sdk/libprldap/libprldap.def
similarity index 100%
rename from ldap/c-sdk/libraries/libprldap/libprldap.def
rename to ldap/c-sdk/libprldap/libprldap.def
diff --git a/ldap/c-sdk/libraries/libprldap/moz.build b/ldap/c-sdk/libprldap/moz.build
similarity index 90%
rename from ldap/c-sdk/libraries/libprldap/moz.build
rename to ldap/c-sdk/libprldap/moz.build
index 422557cc95..4b096a73fe 100644
--- a/ldap/c-sdk/libraries/libprldap/moz.build
+++ b/ldap/c-sdk/libprldap/moz.build
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 SharedLibrary('prldap60')
 
@@ -22,7 +22,7 @@ DEFINES['USE_WAITPID'] = True
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 
 USE_LIBS += [
diff --git a/ldap/c-sdk/libraries/moz.build b/ldap/c-sdk/moz.build
similarity index 78%
rename from ldap/c-sdk/libraries/moz.build
rename to ldap/c-sdk/moz.build
index 339783bfd7..4ce8c054e8 100644
--- a/ldap/c-sdk/libraries/moz.build
+++ b/ldap/c-sdk/moz.build
@@ -3,9 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
+Library('ldapsdks')
+
 DIRS += [
     'liblber',
     'libldif',
     'libldap',
     'libprldap'
 ]
+
+USE_LIBS += [
+    'ldap60',
+    'ldif60',
+    'prldap60',
+]
\ No newline at end of file
diff --git a/ldap/moz.build b/ldap/moz.build
index cd511ceb1e..5f2f96490c 100644
--- a/ldap/moz.build
+++ b/ldap/moz.build
@@ -3,14 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-Library('ldapsdks')
-
 DIRS += [
-    'c-sdk/libraries'
-]
-
-USE_LIBS += [
-    'ldap60',
-    'ldif60',
-    'prldap60',
+    'c-sdk',
+    'xpcom'
 ]
diff --git a/ldap/xpcom/src/moz.build b/ldap/xpcom/src/moz.build
index 06753e3173..dc63d61187 100644
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -48,6 +48,6 @@ else:
     FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include',
+    '../../c-sdk/include',
 ]
 
diff --git a/ldap/xpcom/src/nsLDAPURL.cpp b/ldap/xpcom/src/nsLDAPURL.cpp
index 3757438486..752ee5b3bf 100644
--- a/ldap/xpcom/src/nsLDAPURL.cpp
+++ b/ldap/xpcom/src/nsLDAPURL.cpp
@@ -723,3 +723,28 @@ nsLDAPURL::GetHasRef(bool *result)
 {
   return mBaseURL->GetHasRef(result);
 }
+
+
+NS_IMETHODIMP
+nsLDAPURL::GetFilePath(nsACString &aFilePath)
+{
+  return mBaseURL->GetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::SetFilePath(const nsACString &aFilePath)
+{
+  return mBaseURL->SetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::GetQuery(nsACString &aQuery)
+{
+  return mBaseURL->GetQuery(aQuery);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::SetQuery(const nsACString &aQuery)
+{
+  return mBaseURL->SetQuery(aQuery);
+}
\ No newline at end of file