94 files changed, 44 insertions, 18 deletions
diff --git a/ldap/ldap-sdk.mozbuild b/ldap/c-sdk/common.mozbuild
index 4377982c5a..4377982c5a 100644
--- a/ldap/ldap-sdk.mozbuild
+++ b/ldap/c-sdk/common.mozbuild
diff --git a/ldap/c-sdk/libraries/liblber/bprint.c b/ldap/c-sdk/liblber/bprint.c
index 7a7ccc01f2..7a7ccc01f2 100644
--- a/ldap/c-sdk/libraries/liblber/bprint.c
+++ b/ldap/c-sdk/liblber/bprint.c
diff --git a/ldap/c-sdk/libraries/liblber/decode.c b/ldap/c-sdk/liblber/decode.c
index 732dd6e646..732dd6e646 100644
--- a/ldap/c-sdk/libraries/liblber/decode.c
+++ b/ldap/c-sdk/liblber/decode.c
diff --git a/ldap/c-sdk/libraries/liblber/dtest.c b/ldap/c-sdk/liblber/dtest.c
index 71f13d45a8..71f13d45a8 100644
--- a/ldap/c-sdk/libraries/liblber/dtest.c
+++ b/ldap/c-sdk/liblber/dtest.c
diff --git a/ldap/c-sdk/libraries/liblber/encode.c b/ldap/c-sdk/liblber/encode.c
index 1c47b12a02..1c47b12a02 100644
--- a/ldap/c-sdk/libraries/liblber/encode.c
+++ b/ldap/c-sdk/liblber/encode.c
diff --git a/ldap/c-sdk/libraries/liblber/etest.c b/ldap/c-sdk/liblber/etest.c
index f2bab358fc..f2bab358fc 100644
--- a/ldap/c-sdk/libraries/liblber/etest.c
+++ b/ldap/c-sdk/liblber/etest.c
diff --git a/ldap/c-sdk/libraries/liblber/idtest.c b/ldap/c-sdk/liblber/idtest.c
index e6f8fa4ae7..e6f8fa4ae7 100644
--- a/ldap/c-sdk/libraries/liblber/idtest.c
+++ b/ldap/c-sdk/liblber/idtest.c
diff --git a/ldap/c-sdk/libraries/liblber/io.c b/ldap/c-sdk/liblber/io.c
index fc81a9deeb..fc81a9deeb 100644
--- a/ldap/c-sdk/libraries/liblber/io.c
+++ b/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
index 24b15bdc5f..24b15bdc5f 100644
--- a/ldap/c-sdk/libraries/liblber/lber-int.h
+++ b/ldap/c-sdk/liblber/lber-int.h
diff --git a/ldap/c-sdk/libraries/liblber/moz.build b/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
index a514cfd895..a514cfd895 100644
--- a/ldap/c-sdk/libraries/libldap/abandon.c
+++ b/ldap/c-sdk/libldap/abandon.c
diff --git a/ldap/c-sdk/libraries/libldap/add.c b/ldap/c-sdk/libldap/add.c
index 0cb5dbfb5f..0cb5dbfb5f 100644
--- a/ldap/c-sdk/libraries/libldap/add.c
+++ b/ldap/c-sdk/libldap/add.c
diff --git a/ldap/c-sdk/libraries/libldap/authzidctrl.c b/ldap/c-sdk/libldap/authzidctrl.c
index 69b776cdc4..69b776cdc4 100644
--- a/ldap/c-sdk/libraries/libldap/authzidctrl.c
+++ b/ldap/c-sdk/libldap/authzidctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/bind.c b/ldap/c-sdk/libldap/bind.c
index 8b5504be31..8b5504be31 100644
--- a/ldap/c-sdk/libraries/libldap/bind.c
+++ b/ldap/c-sdk/libldap/bind.c
diff --git a/ldap/c-sdk/libraries/libldap/cache.c b/ldap/c-sdk/libldap/cache.c
index 54195e5fe3..54195e5fe3 100644
--- a/ldap/c-sdk/libraries/libldap/cache.c
+++ b/ldap/c-sdk/libldap/cache.c
diff --git a/ldap/c-sdk/libraries/libldap/charray.c b/ldap/c-sdk/libldap/charray.c
index 043f99e8aa..043f99e8aa 100644
--- a/ldap/c-sdk/libraries/libldap/charray.c
+++ b/ldap/c-sdk/libldap/charray.c
diff --git a/ldap/c-sdk/libraries/libldap/charset.c b/ldap/c-sdk/libldap/charset.c
index 23bad239be..23bad239be 100644
--- a/ldap/c-sdk/libraries/libldap/charset.c
+++ b/ldap/c-sdk/libldap/charset.c
diff --git a/ldap/c-sdk/libraries/libldap/cldap.c b/ldap/c-sdk/libldap/cldap.c
index 829d34c287..829d34c287 100644
--- a/ldap/c-sdk/libraries/libldap/cldap.c
+++ b/ldap/c-sdk/libldap/cldap.c
diff --git a/ldap/c-sdk/libraries/libldap/compare.c b/ldap/c-sdk/libldap/compare.c
index 6ccd0e8aa5..6ccd0e8aa5 100644
--- a/ldap/c-sdk/libraries/libldap/compare.c
+++ b/ldap/c-sdk/libldap/compare.c
diff --git a/ldap/c-sdk/libraries/libldap/compat.c b/ldap/c-sdk/libldap/compat.c
index 94e58ca7a3..94e58ca7a3 100644
--- a/ldap/c-sdk/libraries/libldap/compat.c
+++ b/ldap/c-sdk/libldap/compat.c
diff --git a/ldap/c-sdk/libraries/libldap/control.c b/ldap/c-sdk/libldap/control.c
index 5f2eb73758..5f2eb73758 100644
--- a/ldap/c-sdk/libraries/libldap/control.c
+++ b/ldap/c-sdk/libldap/control.c
diff --git a/ldap/c-sdk/libraries/libldap/countvalues.c b/ldap/c-sdk/libldap/countvalues.c
index 90e9e0adc6..90e9e0adc6 100644
--- a/ldap/c-sdk/libraries/libldap/countvalues.c
+++ b/ldap/c-sdk/libldap/countvalues.c
diff --git a/ldap/c-sdk/libraries/libldap/delete.c b/ldap/c-sdk/libldap/delete.c
index 531761371b..531761371b 100644
--- a/ldap/c-sdk/libraries/libldap/delete.c
+++ b/ldap/c-sdk/libldap/delete.c
diff --git a/ldap/c-sdk/libraries/libldap/disptmpl.c b/ldap/c-sdk/libldap/disptmpl.c
index 17fc71944b..17fc71944b 100644
--- a/ldap/c-sdk/libraries/libldap/disptmpl.c
+++ b/ldap/c-sdk/libldap/disptmpl.c
diff --git a/ldap/c-sdk/libraries/libldap/dllmain.c b/ldap/c-sdk/libldap/dllmain.c
index b51c16caa4..b51c16caa4 100644
--- a/ldap/c-sdk/libraries/libldap/dllmain.c
+++ b/ldap/c-sdk/libldap/dllmain.c
diff --git a/ldap/c-sdk/libraries/libldap/dsparse.c b/ldap/c-sdk/libldap/dsparse.c
index 22d411617c..22d411617c 100644
--- a/ldap/c-sdk/libraries/libldap/dsparse.c
+++ b/ldap/c-sdk/libldap/dsparse.c
diff --git a/ldap/c-sdk/libraries/libldap/error.c b/ldap/c-sdk/libldap/error.c
index 82cbb56cb7..82cbb56cb7 100644
--- a/ldap/c-sdk/libraries/libldap/error.c
+++ b/ldap/c-sdk/libldap/error.c
diff --git a/ldap/c-sdk/libraries/libldap/extendop.c b/ldap/c-sdk/libldap/extendop.c
index f1a92afcd5..f1a92afcd5 100644
--- a/ldap/c-sdk/libraries/libldap/extendop.c
+++ b/ldap/c-sdk/libldap/extendop.c
diff --git a/ldap/c-sdk/libraries/libldap/free.c b/ldap/c-sdk/libldap/free.c
index 821ebad10c..821ebad10c 100644
--- a/ldap/c-sdk/libraries/libldap/free.c
+++ b/ldap/c-sdk/libldap/free.c
diff --git a/ldap/c-sdk/libraries/libldap/freevalues.c b/ldap/c-sdk/libldap/freevalues.c
index 29a0ea03f6..29a0ea03f6 100644
--- a/ldap/c-sdk/libraries/libldap/freevalues.c
+++ b/ldap/c-sdk/libldap/freevalues.c
diff --git a/ldap/c-sdk/libraries/libldap/friendly.c b/ldap/c-sdk/libldap/friendly.c
index d7b5dc65d7..d7b5dc65d7 100644
--- a/ldap/c-sdk/libraries/libldap/friendly.c
+++ b/ldap/c-sdk/libldap/friendly.c
diff --git a/ldap/c-sdk/libraries/libldap/getattr.c b/ldap/c-sdk/libldap/getattr.c
index fbe688fea3..fbe688fea3 100644
--- a/ldap/c-sdk/libraries/libldap/getattr.c
+++ b/ldap/c-sdk/libldap/getattr.c
diff --git a/ldap/c-sdk/libraries/libldap/getdn.c b/ldap/c-sdk/libldap/getdn.c
index 4fab52cc6d..4fab52cc6d 100644
--- a/ldap/c-sdk/libraries/libldap/getdn.c
+++ b/ldap/c-sdk/libldap/getdn.c
diff --git a/ldap/c-sdk/libraries/libldap/getdxbyname.c b/ldap/c-sdk/libldap/getdxbyname.c
index d706144586..d706144586 100644
--- a/ldap/c-sdk/libraries/libldap/getdxbyname.c
+++ b/ldap/c-sdk/libldap/getdxbyname.c
diff --git a/ldap/c-sdk/libraries/libldap/geteffectiverightsctrl.c b/ldap/c-sdk/libldap/geteffectiverightsctrl.c
index f03fdc4416..f03fdc4416 100644
--- a/ldap/c-sdk/libraries/libldap/geteffectiverightsctrl.c
+++ b/ldap/c-sdk/libldap/geteffectiverightsctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/getentry.c b/ldap/c-sdk/libldap/getentry.c
index fb999265b9..fb999265b9 100644
--- a/ldap/c-sdk/libraries/libldap/getentry.c
+++ b/ldap/c-sdk/libldap/getentry.c
diff --git a/ldap/c-sdk/libraries/libldap/getfilter.c b/ldap/c-sdk/libldap/getfilter.c
index ff2ee77f91..ff2ee77f91 100644
--- a/ldap/c-sdk/libraries/libldap/getfilter.c
+++ b/ldap/c-sdk/libldap/getfilter.c
diff --git a/ldap/c-sdk/libraries/libldap/getoption.c b/ldap/c-sdk/libldap/getoption.c
index 73e21a2dc9..73e21a2dc9 100644
--- a/ldap/c-sdk/libraries/libldap/getoption.c
+++ b/ldap/c-sdk/libldap/getoption.c
diff --git a/ldap/c-sdk/libraries/libldap/getvalues.c b/ldap/c-sdk/libldap/getvalues.c
index cae40d2cdf..cae40d2cdf 100644
--- a/ldap/c-sdk/libraries/libldap/getvalues.c
+++ b/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
index f64d1b3d3a..f64d1b3d3a 100644
--- a/ldap/c-sdk/libraries/libldap/ldap-int.h
+++ b/ldap/c-sdk/libldap/ldap-int.h
diff --git a/ldap/c-sdk/libraries/libldap/libldap.def b/ldap/c-sdk/libldap/libldap.def
index dd79389a27..dd79389a27 100644
--- a/ldap/c-sdk/libraries/libldap/libldap.def
+++ b/ldap/c-sdk/libldap/libldap.def
diff --git a/ldap/c-sdk/libraries/libldap/memcache.c b/ldap/c-sdk/libldap/memcache.c
index 78943408aa..78943408aa 100644
--- a/ldap/c-sdk/libraries/libldap/memcache.c
+++ b/ldap/c-sdk/libldap/memcache.c
diff --git a/ldap/c-sdk/libraries/libldap/message.c b/ldap/c-sdk/libldap/message.c
index bfbd200f87..bfbd200f87 100644
--- a/ldap/c-sdk/libraries/libldap/message.c
+++ b/ldap/c-sdk/libldap/message.c
diff --git a/ldap/c-sdk/libraries/libldap/modify.c b/ldap/c-sdk/libldap/modify.c
index ea81102c4c..ea81102c4c 100644
--- a/ldap/c-sdk/libraries/libldap/modify.c
+++ b/ldap/c-sdk/libldap/modify.c
diff --git a/ldap/c-sdk/libraries/libldap/moz.build b/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
index 4f0bc57501..4f0bc57501 100644
--- a/ldap/c-sdk/libraries/libldap/mozock.c
+++ b/ldap/c-sdk/libldap/mozock.c
diff --git a/ldap/c-sdk/libraries/libldap/nsprthreadtest.c b/ldap/c-sdk/libldap/nsprthreadtest.c
index f9af68b423..f9af68b423 100644
--- a/ldap/c-sdk/libraries/libldap/nsprthreadtest.c
+++ b/ldap/c-sdk/libldap/nsprthreadtest.c
diff --git a/ldap/c-sdk/libraries/libldap/open.c b/ldap/c-sdk/libldap/open.c
index 06cb629cbb..06cb629cbb 100644
--- a/ldap/c-sdk/libraries/libldap/open.c
+++ b/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
index 2e70139be3..2e70139be3 100644
--- a/ldap/c-sdk/libraries/libldap/os-ip.c
+++ b/ldap/c-sdk/libldap/os-ip.c
diff --git a/ldap/c-sdk/libraries/libldap/proxyauthctrl.c b/ldap/c-sdk/libldap/proxyauthctrl.c
index e8e80cb144..e8e80cb144 100644
--- a/ldap/c-sdk/libraries/libldap/proxyauthctrl.c
+++ b/ldap/c-sdk/libldap/proxyauthctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/psearch.c b/ldap/c-sdk/libldap/psearch.c
index 71b9da90dd..71b9da90dd 100644
--- a/ldap/c-sdk/libraries/libldap/psearch.c
+++ b/ldap/c-sdk/libldap/psearch.c
diff --git a/ldap/c-sdk/libraries/libldap/pthreadtest.c b/ldap/c-sdk/libldap/pthreadtest.c
index fa913f6919..fa913f6919 100644
--- a/ldap/c-sdk/libraries/libldap/pthreadtest.c
+++ b/ldap/c-sdk/libldap/pthreadtest.c
diff --git a/ldap/c-sdk/libraries/libldap/pwmodext.c b/ldap/c-sdk/libldap/pwmodext.c
index fd737c4a3f..fd737c4a3f 100644
--- a/ldap/c-sdk/libraries/libldap/pwmodext.c
+++ b/ldap/c-sdk/libldap/pwmodext.c
diff --git a/ldap/c-sdk/libraries/libldap/pwpctrl.c b/ldap/c-sdk/libldap/pwpctrl.c
index 26a3f1b2f6..26a3f1b2f6 100644
--- a/ldap/c-sdk/libraries/libldap/pwpctrl.c
+++ b/ldap/c-sdk/libldap/pwpctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/referral.c b/ldap/c-sdk/libldap/referral.c
index 742d3d9861..742d3d9861 100644
--- a/ldap/c-sdk/libraries/libldap/referral.c
+++ b/ldap/c-sdk/libldap/referral.c
diff --git a/ldap/c-sdk/libraries/libldap/regex.c b/ldap/c-sdk/libldap/regex.c
index 4ba4ee08a1..4ba4ee08a1 100644
--- a/ldap/c-sdk/libraries/libldap/regex.c
+++ b/ldap/c-sdk/libldap/regex.c
diff --git a/ldap/c-sdk/libraries/libldap/rename.c b/ldap/c-sdk/libldap/rename.c
index ac3ec7c737..ac3ec7c737 100644
--- a/ldap/c-sdk/libraries/libldap/rename.c
+++ b/ldap/c-sdk/libldap/rename.c
diff --git a/ldap/c-sdk/libraries/libldap/request.c b/ldap/c-sdk/libldap/request.c
index d379917b2b..d379917b2b 100644
--- a/ldap/c-sdk/libraries/libldap/request.c
+++ b/ldap/c-sdk/libldap/request.c
diff --git a/ldap/c-sdk/libraries/libldap/reslist.c b/ldap/c-sdk/libldap/reslist.c
index a382941eba..a382941eba 100644
--- a/ldap/c-sdk/libraries/libldap/reslist.c
+++ b/ldap/c-sdk/libldap/reslist.c
diff --git a/ldap/c-sdk/libraries/libldap/result.c b/ldap/c-sdk/libldap/result.c
index 59c15f8115..59c15f8115 100644
--- a/ldap/c-sdk/libraries/libldap/result.c
+++ b/ldap/c-sdk/libldap/result.c
diff --git a/ldap/c-sdk/libraries/libldap/saslbind.c b/ldap/c-sdk/libldap/saslbind.c
index 5cbe73bbff..5cbe73bbff 100644
--- a/ldap/c-sdk/libraries/libldap/saslbind.c
+++ b/ldap/c-sdk/libldap/saslbind.c
diff --git a/ldap/c-sdk/libraries/libldap/saslio.c b/ldap/c-sdk/libldap/saslio.c
index 6ab6303d0c..6ab6303d0c 100644
--- a/ldap/c-sdk/libraries/libldap/saslio.c
+++ b/ldap/c-sdk/libldap/saslio.c
diff --git a/ldap/c-sdk/libraries/libldap/sbind.c b/ldap/c-sdk/libldap/sbind.c
index d9bfc71fd4..d9bfc71fd4 100644
--- a/ldap/c-sdk/libraries/libldap/sbind.c
+++ b/ldap/c-sdk/libldap/sbind.c
diff --git a/ldap/c-sdk/libraries/libldap/search.c b/ldap/c-sdk/libldap/search.c
index 648d739e6a..648d739e6a 100644
--- a/ldap/c-sdk/libraries/libldap/search.c
+++ b/ldap/c-sdk/libldap/search.c
diff --git a/ldap/c-sdk/libraries/libldap/setoption.c b/ldap/c-sdk/libldap/setoption.c
index 5c4d753f5a..5c4d753f5a 100644
--- a/ldap/c-sdk/libraries/libldap/setoption.c
+++ b/ldap/c-sdk/libldap/setoption.c
diff --git a/ldap/c-sdk/libraries/libldap/sort.c b/ldap/c-sdk/libldap/sort.c
index 8a716c818b..8a716c818b 100644
--- a/ldap/c-sdk/libraries/libldap/sort.c
+++ b/ldap/c-sdk/libldap/sort.c
diff --git a/ldap/c-sdk/libraries/libldap/sortctrl.c b/ldap/c-sdk/libldap/sortctrl.c
index 585e2fd3fa..585e2fd3fa 100644
--- a/ldap/c-sdk/libraries/libldap/sortctrl.c
+++ b/ldap/c-sdk/libldap/sortctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/srchpref.c b/ldap/c-sdk/libldap/srchpref.c
index a3025afd39..a3025afd39 100644
--- a/ldap/c-sdk/libraries/libldap/srchpref.c
+++ b/ldap/c-sdk/libldap/srchpref.c
diff --git a/ldap/c-sdk/libraries/libldap/test.c b/ldap/c-sdk/libldap/test.c
index fa984f3430..fa984f3430 100644
--- a/ldap/c-sdk/libraries/libldap/test.c
+++ b/ldap/c-sdk/libldap/test.c
diff --git a/ldap/c-sdk/libraries/libldap/tmplout.c b/ldap/c-sdk/libldap/tmplout.c
index 0dded6b4c5..0dded6b4c5 100644
--- a/ldap/c-sdk/libraries/libldap/tmplout.c
+++ b/ldap/c-sdk/libldap/tmplout.c
diff --git a/ldap/c-sdk/libraries/libldap/tmpltest.c b/ldap/c-sdk/libldap/tmpltest.c
index 35ee54e06d..35ee54e06d 100644
--- a/ldap/c-sdk/libraries/libldap/tmpltest.c
+++ b/ldap/c-sdk/libldap/tmpltest.c
diff --git a/ldap/c-sdk/libraries/libldap/ufn.c b/ldap/c-sdk/libldap/ufn.c
index 54e737e158..54e737e158 100644
--- a/ldap/c-sdk/libraries/libldap/ufn.c
+++ b/ldap/c-sdk/libldap/ufn.c
diff --git a/ldap/c-sdk/libraries/libldap/unbind.c b/ldap/c-sdk/libldap/unbind.c
index 95ca49411f..95ca49411f 100644
--- a/ldap/c-sdk/libraries/libldap/unbind.c
+++ b/ldap/c-sdk/libldap/unbind.c
diff --git a/ldap/c-sdk/libraries/libldap/unescape.c b/ldap/c-sdk/libldap/unescape.c
index 66d5bd27ff..66d5bd27ff 100644
--- a/ldap/c-sdk/libraries/libldap/unescape.c
+++ b/ldap/c-sdk/libldap/unescape.c
diff --git a/ldap/c-sdk/libraries/libldap/url.c b/ldap/c-sdk/libldap/url.c
index 789ee3ac2a..789ee3ac2a 100644
--- a/ldap/c-sdk/libraries/libldap/url.c
+++ b/ldap/c-sdk/libldap/url.c
diff --git a/ldap/c-sdk/libraries/libldap/userstatusctrl.c b/ldap/c-sdk/libldap/userstatusctrl.c
index 1127d67bb7..1127d67bb7 100644
--- a/ldap/c-sdk/libraries/libldap/userstatusctrl.c
+++ b/ldap/c-sdk/libldap/userstatusctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/utf8.c b/ldap/c-sdk/libldap/utf8.c
index 98957cc5b4..98957cc5b4 100644
--- a/ldap/c-sdk/libraries/libldap/utf8.c
+++ b/ldap/c-sdk/libldap/utf8.c
diff --git a/ldap/c-sdk/libraries/libldap/vlistctrl.c b/ldap/c-sdk/libldap/vlistctrl.c
index e42d746412..e42d746412 100644
--- a/ldap/c-sdk/libraries/libldap/vlistctrl.c
+++ b/ldap/c-sdk/libldap/vlistctrl.c
diff --git a/ldap/c-sdk/libraries/libldap/whoami.c b/ldap/c-sdk/libldap/whoami.c
index 35e10e71c7..35e10e71c7 100644
--- a/ldap/c-sdk/libraries/libldap/whoami.c
+++ b/ldap/c-sdk/libldap/whoami.c
diff --git a/ldap/c-sdk/libraries/libldif/libldif.def b/ldap/c-sdk/libldif/libldif.def
index 1c5ad53820..1c5ad53820 100644
--- a/ldap/c-sdk/libraries/libldif/libldif.def
+++ b/ldap/c-sdk/libldif/libldif.def
diff --git a/ldap/c-sdk/libraries/libldif/line64.c b/ldap/c-sdk/libldif/line64.c
index a819825cce..a819825cce 100644
--- a/ldap/c-sdk/libraries/libldif/line64.c
+++ b/ldap/c-sdk/libldif/line64.c
diff --git a/ldap/c-sdk/libraries/libldif/moz.build b/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
index a88bfe31c7..a88bfe31c7 100644
--- a/ldap/c-sdk/libraries/libprldap/ldappr-dns.c
+++ b/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
index b0cb6ed967..b0cb6ed967 100644
--- a/ldap/c-sdk/libraries/libprldap/ldappr-error.c
+++ b/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
index ed4bfbce61..ed4bfbce61 100644
--- a/ldap/c-sdk/libraries/libprldap/ldappr-int.h
+++ b/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
index 863545146a..863545146a 100644
--- a/ldap/c-sdk/libraries/libprldap/ldappr-io.c
+++ b/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
index 6e9e597e6a..6e9e597e6a 100644
--- a/ldap/c-sdk/libraries/libprldap/ldappr-public.c
+++ b/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
index 1cfdc92635..1cfdc92635 100644
--- a/ldap/c-sdk/libraries/libprldap/ldappr-threads.c
+++ b/ldap/c-sdk/libprldap/ldappr-threads.c
diff --git a/ldap/c-sdk/libraries/libprldap/libprldap.def b/ldap/c-sdk/libprldap/libprldap.def
index a18e7ee824..a18e7ee824 100644
--- a/ldap/c-sdk/libraries/libprldap/libprldap.def
+++ b/ldap/c-sdk/libprldap/libprldap.def
diff --git a/ldap/c-sdk/libraries/libprldap/moz.build b/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
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