Move shared gen_ndr files to librpc/gen_ndr in the root.

At the moment these files are used just by Samba 3, but the next step
will be using them from Samba 4 as well.

126 files changed, 54 insertions, 54 deletions

diff --git a/source3/librpc/gen_ndr/cli_dfs.c b/librpc/gen_ndr/cli_dfs.c
index 81ec14694a..81ec14694a 100644
--- a/source3/librpc/gen_ndr/cli_dfs.c
+++ b/librpc/gen_ndr/cli_dfs.c
diff --git a/source3/librpc/gen_ndr/cli_dfs.h b/librpc/gen_ndr/cli_dfs.h
index 0c862099bf..0c862099bf 100644
--- a/source3/librpc/gen_ndr/cli_dfs.h
+++ b/librpc/gen_ndr/cli_dfs.h
diff --git a/source3/librpc/gen_ndr/cli_drsuapi.c b/librpc/gen_ndr/cli_drsuapi.c
index 57d7a25d9c..57d7a25d9c 100644
--- a/source3/librpc/gen_ndr/cli_drsuapi.c
+++ b/librpc/gen_ndr/cli_drsuapi.c
diff --git a/source3/librpc/gen_ndr/cli_drsuapi.h b/librpc/gen_ndr/cli_drsuapi.h
index ab7375f4ca..ab7375f4ca 100644
--- a/source3/librpc/gen_ndr/cli_drsuapi.h
+++ b/librpc/gen_ndr/cli_drsuapi.h
diff --git a/source3/librpc/gen_ndr/cli_dssetup.c b/librpc/gen_ndr/cli_dssetup.c
index 5526f8d59b..5526f8d59b 100644
--- a/source3/librpc/gen_ndr/cli_dssetup.c
+++ b/librpc/gen_ndr/cli_dssetup.c
diff --git a/source3/librpc/gen_ndr/cli_dssetup.h b/librpc/gen_ndr/cli_dssetup.h
index e2dca43360..e2dca43360 100644
--- a/source3/librpc/gen_ndr/cli_dssetup.h
+++ b/librpc/gen_ndr/cli_dssetup.h
diff --git a/source3/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index a775825f5f..a775825f5f 100644
--- a/source3/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
diff --git a/source3/librpc/gen_ndr/cli_echo.h b/librpc/gen_ndr/cli_echo.h
index 9da13e97f6..9da13e97f6 100644
--- a/source3/librpc/gen_ndr/cli_echo.h
+++ b/librpc/gen_ndr/cli_echo.h
diff --git a/source3/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 19673ab659..19673ab659 100644
--- a/source3/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
diff --git a/source3/librpc/gen_ndr/cli_epmapper.h b/librpc/gen_ndr/cli_epmapper.h
index 44884fad7e..44884fad7e 100644
--- a/source3/librpc/gen_ndr/cli_epmapper.h
+++ b/librpc/gen_ndr/cli_epmapper.h
diff --git a/source3/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index 02d8fb2e65..02d8fb2e65 100644
--- a/source3/librpc/gen_ndr/cli_eventlog.c
+++ b/librpc/gen_ndr/cli_eventlog.c
diff --git a/source3/librpc/gen_ndr/cli_eventlog.h b/librpc/gen_ndr/cli_eventlog.h
index 0594a06f59..0594a06f59 100644
--- a/source3/librpc/gen_ndr/cli_eventlog.h
+++ b/librpc/gen_ndr/cli_eventlog.h
diff --git a/source3/librpc/gen_ndr/cli_initshutdown.c b/librpc/gen_ndr/cli_initshutdown.c
index bc8ca5b5f1..bc8ca5b5f1 100644
--- a/source3/librpc/gen_ndr/cli_initshutdown.c
+++ b/librpc/gen_ndr/cli_initshutdown.c
diff --git a/source3/librpc/gen_ndr/cli_initshutdown.h b/librpc/gen_ndr/cli_initshutdown.h
index e2eb9daabe..e2eb9daabe 100644
--- a/source3/librpc/gen_ndr/cli_initshutdown.h
+++ b/librpc/gen_ndr/cli_initshutdown.h
diff --git a/source3/librpc/gen_ndr/cli_lsa.c b/librpc/gen_ndr/cli_lsa.c
index e7775b1bfe..e7775b1bfe 100644
--- a/source3/librpc/gen_ndr/cli_lsa.c
+++ b/librpc/gen_ndr/cli_lsa.c
diff --git a/source3/librpc/gen_ndr/cli_lsa.h b/librpc/gen_ndr/cli_lsa.h
index 554182c6db..554182c6db 100644
--- a/source3/librpc/gen_ndr/cli_lsa.h
+++ b/librpc/gen_ndr/cli_lsa.h
diff --git a/source3/librpc/gen_ndr/cli_netlogon.c b/librpc/gen_ndr/cli_netlogon.c
index 1ce4e67c56..1ce4e67c56 100644
--- a/source3/librpc/gen_ndr/cli_netlogon.c
+++ b/librpc/gen_ndr/cli_netlogon.c
diff --git a/source3/librpc/gen_ndr/cli_netlogon.h b/librpc/gen_ndr/cli_netlogon.h
index 3fbc00e9da..3fbc00e9da 100644
--- a/source3/librpc/gen_ndr/cli_netlogon.h
+++ b/librpc/gen_ndr/cli_netlogon.h
diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.c b/librpc/gen_ndr/cli_ntsvcs.c
index 0f97970e0b..0f97970e0b 100644
--- a/source3/librpc/gen_ndr/cli_ntsvcs.c
+++ b/librpc/gen_ndr/cli_ntsvcs.c
diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.h b/librpc/gen_ndr/cli_ntsvcs.h
index fc4a9f4a71..fc4a9f4a71 100644
--- a/source3/librpc/gen_ndr/cli_ntsvcs.h
+++ b/librpc/gen_ndr/cli_ntsvcs.h
diff --git a/source3/librpc/gen_ndr/cli_samr.c b/librpc/gen_ndr/cli_samr.c
index 7edb790286..7edb790286 100644
--- a/source3/librpc/gen_ndr/cli_samr.c
+++ b/librpc/gen_ndr/cli_samr.c
diff --git a/source3/librpc/gen_ndr/cli_samr.h b/librpc/gen_ndr/cli_samr.h
index b57d63334e..b57d63334e 100644
--- a/source3/librpc/gen_ndr/cli_samr.h
+++ b/librpc/gen_ndr/cli_samr.h
diff --git a/source3/librpc/gen_ndr/cli_srvsvc.c b/librpc/gen_ndr/cli_srvsvc.c
index eb81652a1d..eb81652a1d 100644
--- a/source3/librpc/gen_ndr/cli_srvsvc.c
+++ b/librpc/gen_ndr/cli_srvsvc.c
diff --git a/source3/librpc/gen_ndr/cli_srvsvc.h b/librpc/gen_ndr/cli_srvsvc.h
index 44b50e7d19..44b50e7d19 100644
--- a/source3/librpc/gen_ndr/cli_srvsvc.h
+++ b/librpc/gen_ndr/cli_srvsvc.h
diff --git a/source3/librpc/gen_ndr/cli_svcctl.c b/librpc/gen_ndr/cli_svcctl.c
index 9f11a40d7e..9f11a40d7e 100644
--- a/source3/librpc/gen_ndr/cli_svcctl.c
+++ b/librpc/gen_ndr/cli_svcctl.c
diff --git a/source3/librpc/gen_ndr/cli_svcctl.h b/librpc/gen_ndr/cli_svcctl.h
index 78c9bf40d8..78c9bf40d8 100644
--- a/source3/librpc/gen_ndr/cli_svcctl.h
+++ b/librpc/gen_ndr/cli_svcctl.h
diff --git a/source3/librpc/gen_ndr/cli_winreg.c b/librpc/gen_ndr/cli_winreg.c
index 17b7281c72..17b7281c72 100644
--- a/source3/librpc/gen_ndr/cli_winreg.c
+++ b/librpc/gen_ndr/cli_winreg.c
diff --git a/source3/librpc/gen_ndr/cli_winreg.h b/librpc/gen_ndr/cli_winreg.h
index fb27bce9d2..fb27bce9d2 100644
--- a/source3/librpc/gen_ndr/cli_winreg.h
+++ b/librpc/gen_ndr/cli_winreg.h
diff --git a/source3/librpc/gen_ndr/cli_wkssvc.c b/librpc/gen_ndr/cli_wkssvc.c
index b82e95311f..b82e95311f 100644
--- a/source3/librpc/gen_ndr/cli_wkssvc.c
+++ b/librpc/gen_ndr/cli_wkssvc.c
diff --git a/source3/librpc/gen_ndr/cli_wkssvc.h b/librpc/gen_ndr/cli_wkssvc.h
index 0d360abfeb..0d360abfeb 100644
--- a/source3/librpc/gen_ndr/cli_wkssvc.h
+++ b/librpc/gen_ndr/cli_wkssvc.h
diff --git a/source3/librpc/gen_ndr/dfs.h b/librpc/gen_ndr/dfs.h
index 07548c3742..07548c3742 100644
--- a/source3/librpc/gen_ndr/dfs.h
+++ b/librpc/gen_ndr/dfs.h
diff --git a/source3/librpc/gen_ndr/drsblobs.h b/librpc/gen_ndr/drsblobs.h
index 692746468e..692746468e 100644
--- a/source3/librpc/gen_ndr/drsblobs.h
+++ b/librpc/gen_ndr/drsblobs.h
diff --git a/source3/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h
index ba01e8f226..ba01e8f226 100644
--- a/source3/librpc/gen_ndr/drsuapi.h
+++ b/librpc/gen_ndr/drsuapi.h
diff --git a/source3/librpc/gen_ndr/dssetup.h b/librpc/gen_ndr/dssetup.h
index d284a63375..d284a63375 100644
--- a/source3/librpc/gen_ndr/dssetup.h
+++ b/librpc/gen_ndr/dssetup.h
diff --git a/source3/librpc/gen_ndr/echo.h b/librpc/gen_ndr/echo.h
index 79d4220714..79d4220714 100644
--- a/source3/librpc/gen_ndr/echo.h
+++ b/librpc/gen_ndr/echo.h
diff --git a/source3/librpc/gen_ndr/epmapper.h b/librpc/gen_ndr/epmapper.h
index 4b75261a02..4b75261a02 100644
--- a/source3/librpc/gen_ndr/epmapper.h
+++ b/librpc/gen_ndr/epmapper.h
diff --git a/source3/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h
index 76b9e863bb..76b9e863bb 100644
--- a/source3/librpc/gen_ndr/eventlog.h
+++ b/librpc/gen_ndr/eventlog.h
diff --git a/source3/librpc/gen_ndr/initshutdown.h b/librpc/gen_ndr/initshutdown.h
index 014e2fe689..014e2fe689 100644
--- a/source3/librpc/gen_ndr/initshutdown.h
+++ b/librpc/gen_ndr/initshutdown.h
diff --git a/source3/librpc/gen_ndr/krb5pac.h b/librpc/gen_ndr/krb5pac.h
index 73bd0d95bb..73bd0d95bb 100644
--- a/source3/librpc/gen_ndr/krb5pac.h
+++ b/librpc/gen_ndr/krb5pac.h
diff --git a/source3/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h
index ee8a31138d..ee8a31138d 100644
--- a/source3/librpc/gen_ndr/lsa.h
+++ b/librpc/gen_ndr/lsa.h
diff --git a/source3/librpc/gen_ndr/misc.h b/librpc/gen_ndr/misc.h
index de4abdcae5..de4abdcae5 100644
--- a/source3/librpc/gen_ndr/misc.h
+++ b/librpc/gen_ndr/misc.h
diff --git a/source3/librpc/gen_ndr/named_pipe_auth.h b/librpc/gen_ndr/named_pipe_auth.h
index 5f4ba9afb1..5f4ba9afb1 100644
--- a/source3/librpc/gen_ndr/named_pipe_auth.h
+++ b/librpc/gen_ndr/named_pipe_auth.h
diff --git a/source3/librpc/gen_ndr/nbt.h b/librpc/gen_ndr/nbt.h
index 4b872d7936..4b872d7936 100644
--- a/source3/librpc/gen_ndr/nbt.h
+++ b/librpc/gen_ndr/nbt.h
diff --git a/source3/librpc/gen_ndr/ndr_dfs.c b/librpc/gen_ndr/ndr_dfs.c
index 75a0d4b755..75a0d4b755 100644
--- a/source3/librpc/gen_ndr/ndr_dfs.c
+++ b/librpc/gen_ndr/ndr_dfs.c
diff --git a/source3/librpc/gen_ndr/ndr_dfs.h b/librpc/gen_ndr/ndr_dfs.h
index a7c66f9693..a7c66f9693 100644
--- a/source3/librpc/gen_ndr/ndr_dfs.h
+++ b/librpc/gen_ndr/ndr_dfs.h
diff --git a/source3/librpc/gen_ndr/ndr_drsblobs.c b/librpc/gen_ndr/ndr_drsblobs.c
index d965e40bd2..d965e40bd2 100644
--- a/source3/librpc/gen_ndr/ndr_drsblobs.c
+++ b/librpc/gen_ndr/ndr_drsblobs.c
diff --git a/source3/librpc/gen_ndr/ndr_drsblobs.h b/librpc/gen_ndr/ndr_drsblobs.h
index 8a5298874a..8a5298874a 100644
--- a/source3/librpc/gen_ndr/ndr_drsblobs.h
+++ b/librpc/gen_ndr/ndr_drsblobs.h
diff --git a/source3/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index c2a4aee180..c2a4aee180 100644
--- a/source3/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
diff --git a/source3/librpc/gen_ndr/ndr_drsuapi.h b/librpc/gen_ndr/ndr_drsuapi.h
index 4b5ead467f..4b5ead467f 100644
--- a/source3/librpc/gen_ndr/ndr_drsuapi.h
+++ b/librpc/gen_ndr/ndr_drsuapi.h
diff --git a/source3/librpc/gen_ndr/ndr_dssetup.c b/librpc/gen_ndr/ndr_dssetup.c
index 0c02784db8..0c02784db8 100644
--- a/source3/librpc/gen_ndr/ndr_dssetup.c
+++ b/librpc/gen_ndr/ndr_dssetup.c
diff --git a/source3/librpc/gen_ndr/ndr_dssetup.h b/librpc/gen_ndr/ndr_dssetup.h
index 103ad116a3..103ad116a3 100644
--- a/source3/librpc/gen_ndr/ndr_dssetup.h
+++ b/librpc/gen_ndr/ndr_dssetup.h
diff --git a/source3/librpc/gen_ndr/ndr_echo.c b/librpc/gen_ndr/ndr_echo.c
index 99556e1bff..99556e1bff 100644
--- a/source3/librpc/gen_ndr/ndr_echo.c
+++ b/librpc/gen_ndr/ndr_echo.c
diff --git a/source3/librpc/gen_ndr/ndr_echo.h b/librpc/gen_ndr/ndr_echo.h
index c1c7716573..c1c7716573 100644
--- a/source3/librpc/gen_ndr/ndr_echo.h
+++ b/librpc/gen_ndr/ndr_echo.h
diff --git a/source3/librpc/gen_ndr/ndr_epmapper.c b/librpc/gen_ndr/ndr_epmapper.c
index 0f1005dda7..0f1005dda7 100644
--- a/source3/librpc/gen_ndr/ndr_epmapper.c
+++ b/librpc/gen_ndr/ndr_epmapper.c
diff --git a/source3/librpc/gen_ndr/ndr_epmapper.h b/librpc/gen_ndr/ndr_epmapper.h
index 0fac75e0af..0fac75e0af 100644
--- a/source3/librpc/gen_ndr/ndr_epmapper.h
+++ b/librpc/gen_ndr/ndr_epmapper.h
diff --git a/source3/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eventlog.c
index 12fa9fcec4..12fa9fcec4 100644
--- a/source3/librpc/gen_ndr/ndr_eventlog.c
+++ b/librpc/gen_ndr/ndr_eventlog.c
diff --git a/source3/librpc/gen_ndr/ndr_eventlog.h b/librpc/gen_ndr/ndr_eventlog.h
index 6002f35a7d..6002f35a7d 100644
--- a/source3/librpc/gen_ndr/ndr_eventlog.h
+++ b/librpc/gen_ndr/ndr_eventlog.h
diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.c b/librpc/gen_ndr/ndr_initshutdown.c
index 62a19af3a2..62a19af3a2 100644
--- a/source3/librpc/gen_ndr/ndr_initshutdown.c
+++ b/librpc/gen_ndr/ndr_initshutdown.c
diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.h b/librpc/gen_ndr/ndr_initshutdown.h
index 2cb5a530b0..2cb5a530b0 100644
--- a/source3/librpc/gen_ndr/ndr_initshutdown.h
+++ b/librpc/gen_ndr/ndr_initshutdown.h
diff --git a/source3/librpc/gen_ndr/ndr_krb5pac.c b/librpc/gen_ndr/ndr_krb5pac.c
index 125fb7eb77..125fb7eb77 100644
--- a/source3/librpc/gen_ndr/ndr_krb5pac.c
+++ b/librpc/gen_ndr/ndr_krb5pac.c
diff --git a/source3/librpc/gen_ndr/ndr_krb5pac.h b/librpc/gen_ndr/ndr_krb5pac.h
index bf09e3fad5..bf09e3fad5 100644
--- a/source3/librpc/gen_ndr/ndr_krb5pac.h
+++ b/librpc/gen_ndr/ndr_krb5pac.h
diff --git a/source3/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c
index 926903865e..926903865e 100644
--- a/source3/librpc/gen_ndr/ndr_lsa.c
+++ b/librpc/gen_ndr/ndr_lsa.c
diff --git a/source3/librpc/gen_ndr/ndr_lsa.h b/librpc/gen_ndr/ndr_lsa.h
index 2f623c2ba9..2f623c2ba9 100644
--- a/source3/librpc/gen_ndr/ndr_lsa.h
+++ b/librpc/gen_ndr/ndr_lsa.h
diff --git a/source3/librpc/gen_ndr/ndr_misc.c b/librpc/gen_ndr/ndr_misc.c
index 971cbdac24..971cbdac24 100644
--- a/source3/librpc/gen_ndr/ndr_misc.c
+++ b/librpc/gen_ndr/ndr_misc.c
diff --git a/source3/librpc/gen_ndr/ndr_misc.h b/librpc/gen_ndr/ndr_misc.h
index b907af0605..b907af0605 100644
--- a/source3/librpc/gen_ndr/ndr_misc.h
+++ b/librpc/gen_ndr/ndr_misc.h
diff --git a/source3/librpc/gen_ndr/ndr_named_pipe_auth.c b/librpc/gen_ndr/ndr_named_pipe_auth.c
index 69412bf427..69412bf427 100644
--- a/source3/librpc/gen_ndr/ndr_named_pipe_auth.c
+++ b/librpc/gen_ndr/ndr_named_pipe_auth.c
diff --git a/source3/librpc/gen_ndr/ndr_named_pipe_auth.h b/librpc/gen_ndr/ndr_named_pipe_auth.h
index fbef9d5f1c..fbef9d5f1c 100644
--- a/source3/librpc/gen_ndr/ndr_named_pipe_auth.h
+++ b/librpc/gen_ndr/ndr_named_pipe_auth.h
diff --git a/source3/librpc/gen_ndr/ndr_nbt.c b/librpc/gen_ndr/ndr_nbt.c
index c02b539da5..c02b539da5 100644
--- a/source3/librpc/gen_ndr/ndr_nbt.c
+++ b/librpc/gen_ndr/ndr_nbt.c
diff --git a/source3/librpc/gen_ndr/ndr_nbt.h b/librpc/gen_ndr/ndr_nbt.h
index 1a0ca0c302..1a0ca0c302 100644
--- a/source3/librpc/gen_ndr/ndr_nbt.h
+++ b/librpc/gen_ndr/ndr_nbt.h
diff --git a/source3/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c
index 81f8ddcab9..81f8ddcab9 100644
--- a/source3/librpc/gen_ndr/ndr_netlogon.c
+++ b/librpc/gen_ndr/ndr_netlogon.c
diff --git a/source3/librpc/gen_ndr/ndr_netlogon.h b/librpc/gen_ndr/ndr_netlogon.h
index 5858906c1c..5858906c1c 100644
--- a/source3/librpc/gen_ndr/ndr_netlogon.h
+++ b/librpc/gen_ndr/ndr_netlogon.h
diff --git a/source3/librpc/gen_ndr/ndr_ntsvcs.c b/librpc/gen_ndr/ndr_ntsvcs.c
index ced6fb7767..ced6fb7767 100644
--- a/source3/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/librpc/gen_ndr/ndr_ntsvcs.c
diff --git a/source3/librpc/gen_ndr/ndr_ntsvcs.h b/librpc/gen_ndr/ndr_ntsvcs.h
index 0e3b6b91c4..0e3b6b91c4 100644
--- a/source3/librpc/gen_ndr/ndr_ntsvcs.h
+++ b/librpc/gen_ndr/ndr_ntsvcs.h
diff --git a/source3/librpc/gen_ndr/ndr_samr.c b/librpc/gen_ndr/ndr_samr.c
index 83db0faaef..83db0faaef 100644
--- a/source3/librpc/gen_ndr/ndr_samr.c
+++ b/librpc/gen_ndr/ndr_samr.c
diff --git a/source3/librpc/gen_ndr/ndr_samr.h b/librpc/gen_ndr/ndr_samr.h
index 64c60ee704..64c60ee704 100644
--- a/source3/librpc/gen_ndr/ndr_samr.h
+++ b/librpc/gen_ndr/ndr_samr.h
diff --git a/source3/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c
index b4d221ac90..b4d221ac90 100644
--- a/source3/librpc/gen_ndr/ndr_security.c
+++ b/librpc/gen_ndr/ndr_security.c
diff --git a/source3/librpc/gen_ndr/ndr_security.h b/librpc/gen_ndr/ndr_security.h
index 41c66aa65b..41c66aa65b 100644
--- a/source3/librpc/gen_ndr/ndr_security.h
+++ b/librpc/gen_ndr/ndr_security.h
diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.c b/librpc/gen_ndr/ndr_srvsvc.c
index 125542d14a..125542d14a 100644
--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
+++ b/librpc/gen_ndr/ndr_srvsvc.c
diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.h b/librpc/gen_ndr/ndr_srvsvc.h
index 126680cad0..126680cad0 100644
--- a/source3/librpc/gen_ndr/ndr_srvsvc.h
+++ b/librpc/gen_ndr/ndr_srvsvc.h
diff --git a/source3/librpc/gen_ndr/ndr_svcctl.c b/librpc/gen_ndr/ndr_svcctl.c
index 2bccde9ba0..2bccde9ba0 100644
--- a/source3/librpc/gen_ndr/ndr_svcctl.c
+++ b/librpc/gen_ndr/ndr_svcctl.c
diff --git a/source3/librpc/gen_ndr/ndr_svcctl.h b/librpc/gen_ndr/ndr_svcctl.h
index 8d7739a7db..8d7739a7db 100644
--- a/source3/librpc/gen_ndr/ndr_svcctl.h
+++ b/librpc/gen_ndr/ndr_svcctl.h
diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/librpc/gen_ndr/ndr_winreg.c
index 791d11103d..791d11103d 100644
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/librpc/gen_ndr/ndr_winreg.c
diff --git a/source3/librpc/gen_ndr/ndr_winreg.h b/librpc/gen_ndr/ndr_winreg.h
index 8dea3ae273..8dea3ae273 100644
--- a/source3/librpc/gen_ndr/ndr_winreg.h
+++ b/librpc/gen_ndr/ndr_winreg.h
diff --git a/source3/librpc/gen_ndr/ndr_wkssvc.c b/librpc/gen_ndr/ndr_wkssvc.c
index e494f08be0..e494f08be0 100644
--- a/source3/librpc/gen_ndr/ndr_wkssvc.c
+++ b/librpc/gen_ndr/ndr_wkssvc.c
diff --git a/source3/librpc/gen_ndr/ndr_wkssvc.h b/librpc/gen_ndr/ndr_wkssvc.h
index 0fa4d3f8d4..0fa4d3f8d4 100644
--- a/source3/librpc/gen_ndr/ndr_wkssvc.h
+++ b/librpc/gen_ndr/ndr_wkssvc.h
diff --git a/source3/librpc/gen_ndr/ndr_xattr.c b/librpc/gen_ndr/ndr_xattr.c
index 75781d763d..75781d763d 100644
--- a/source3/librpc/gen_ndr/ndr_xattr.c
+++ b/librpc/gen_ndr/ndr_xattr.c
diff --git a/source3/librpc/gen_ndr/ndr_xattr.h b/librpc/gen_ndr/ndr_xattr.h
index c565e8513a..c565e8513a 100644
--- a/source3/librpc/gen_ndr/ndr_xattr.h
+++ b/librpc/gen_ndr/ndr_xattr.h
diff --git a/source3/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h
index 7fb253446a..7fb253446a 100644
--- a/source3/librpc/gen_ndr/netlogon.h
+++ b/librpc/gen_ndr/netlogon.h
diff --git a/source3/librpc/gen_ndr/ntsvcs.h b/librpc/gen_ndr/ntsvcs.h
index 5021aa2252..5021aa2252 100644
--- a/source3/librpc/gen_ndr/ntsvcs.h
+++ b/librpc/gen_ndr/ntsvcs.h
diff --git a/source3/librpc/gen_ndr/samr.h b/librpc/gen_ndr/samr.h
index 3116f26d8c..3116f26d8c 100644
--- a/source3/librpc/gen_ndr/samr.h
+++ b/librpc/gen_ndr/samr.h
diff --git a/source3/librpc/gen_ndr/security.h b/librpc/gen_ndr/security.h
index 2b422608ea..2b422608ea 100644
--- a/source3/librpc/gen_ndr/security.h
+++ b/librpc/gen_ndr/security.h
diff --git a/source3/librpc/gen_ndr/srv_dfs.c b/librpc/gen_ndr/srv_dfs.c
index d58272084a..d58272084a 100644
--- a/source3/librpc/gen_ndr/srv_dfs.c
+++ b/librpc/gen_ndr/srv_dfs.c
diff --git a/source3/librpc/gen_ndr/srv_dfs.h b/librpc/gen_ndr/srv_dfs.h
index e4d7a99c73..e4d7a99c73 100644
--- a/source3/librpc/gen_ndr/srv_dfs.h
+++ b/librpc/gen_ndr/srv_dfs.h
diff --git a/source3/librpc/gen_ndr/srv_dssetup.c b/librpc/gen_ndr/srv_dssetup.c
index 62123b826c..62123b826c 100644
--- a/source3/librpc/gen_ndr/srv_dssetup.c
+++ b/librpc/gen_ndr/srv_dssetup.c
diff --git a/source3/librpc/gen_ndr/srv_dssetup.h b/librpc/gen_ndr/srv_dssetup.h
index 3233899eac..3233899eac 100644
--- a/source3/librpc/gen_ndr/srv_dssetup.h
+++ b/librpc/gen_ndr/srv_dssetup.h
diff --git a/source3/librpc/gen_ndr/srv_echo.c b/librpc/gen_ndr/srv_echo.c
index 970398dc71..970398dc71 100644
--- a/source3/librpc/gen_ndr/srv_echo.c
+++ b/librpc/gen_ndr/srv_echo.c
diff --git a/source3/librpc/gen_ndr/srv_echo.h b/librpc/gen_ndr/srv_echo.h
index c3b0336652..c3b0336652 100644
--- a/source3/librpc/gen_ndr/srv_echo.h
+++ b/librpc/gen_ndr/srv_echo.h
diff --git a/source3/librpc/gen_ndr/srv_epmapper.c b/librpc/gen_ndr/srv_epmapper.c
index a31d89b8e8..a31d89b8e8 100644
--- a/source3/librpc/gen_ndr/srv_epmapper.c
+++ b/librpc/gen_ndr/srv_epmapper.c
diff --git a/source3/librpc/gen_ndr/srv_epmapper.h b/librpc/gen_ndr/srv_epmapper.h
index e0d0105b78..e0d0105b78 100644
--- a/source3/librpc/gen_ndr/srv_epmapper.h
+++ b/librpc/gen_ndr/srv_epmapper.h
diff --git a/source3/librpc/gen_ndr/srv_eventlog.c b/librpc/gen_ndr/srv_eventlog.c
index b9a4a2e9ed..b9a4a2e9ed 100644
--- a/source3/librpc/gen_ndr/srv_eventlog.c
+++ b/librpc/gen_ndr/srv_eventlog.c
diff --git a/source3/librpc/gen_ndr/srv_eventlog.h b/librpc/gen_ndr/srv_eventlog.h
index 6957c66beb..6957c66beb 100644
--- a/source3/librpc/gen_ndr/srv_eventlog.h
+++ b/librpc/gen_ndr/srv_eventlog.h
diff --git a/source3/librpc/gen_ndr/srv_initshutdown.c b/librpc/gen_ndr/srv_initshutdown.c
index 51098074ac..51098074ac 100644
--- a/source3/librpc/gen_ndr/srv_initshutdown.c
+++ b/librpc/gen_ndr/srv_initshutdown.c
diff --git a/source3/librpc/gen_ndr/srv_initshutdown.h b/librpc/gen_ndr/srv_initshutdown.h
index be3ea25271..be3ea25271 100644
--- a/source3/librpc/gen_ndr/srv_initshutdown.h
+++ b/librpc/gen_ndr/srv_initshutdown.h
diff --git a/source3/librpc/gen_ndr/srv_lsa.c b/librpc/gen_ndr/srv_lsa.c
index c30f276800..c30f276800 100644
--- a/source3/librpc/gen_ndr/srv_lsa.c
+++ b/librpc/gen_ndr/srv_lsa.c
diff --git a/source3/librpc/gen_ndr/srv_lsa.h b/librpc/gen_ndr/srv_lsa.h
index 223ee5e970..223ee5e970 100644
--- a/source3/librpc/gen_ndr/srv_lsa.h
+++ b/librpc/gen_ndr/srv_lsa.h
diff --git a/source3/librpc/gen_ndr/srv_netlogon.c b/librpc/gen_ndr/srv_netlogon.c
index 8cb461e94d..8cb461e94d 100644
--- a/source3/librpc/gen_ndr/srv_netlogon.c
+++ b/librpc/gen_ndr/srv_netlogon.c
diff --git a/source3/librpc/gen_ndr/srv_netlogon.h b/librpc/gen_ndr/srv_netlogon.h
index cd68d12f1e..cd68d12f1e 100644
--- a/source3/librpc/gen_ndr/srv_netlogon.h
+++ b/librpc/gen_ndr/srv_netlogon.h
diff --git a/source3/librpc/gen_ndr/srv_ntsvcs.c b/librpc/gen_ndr/srv_ntsvcs.c
index 288f3ed5d7..288f3ed5d7 100644
--- a/source3/librpc/gen_ndr/srv_ntsvcs.c
+++ b/librpc/gen_ndr/srv_ntsvcs.c
diff --git a/source3/librpc/gen_ndr/srv_ntsvcs.h b/librpc/gen_ndr/srv_ntsvcs.h
index c3969b11da..c3969b11da 100644
--- a/source3/librpc/gen_ndr/srv_ntsvcs.h
+++ b/librpc/gen_ndr/srv_ntsvcs.h
diff --git a/source3/librpc/gen_ndr/srv_samr.c b/librpc/gen_ndr/srv_samr.c
index f4facd2914..f4facd2914 100644
--- a/source3/librpc/gen_ndr/srv_samr.c
+++ b/librpc/gen_ndr/srv_samr.c
diff --git a/source3/librpc/gen_ndr/srv_samr.h b/librpc/gen_ndr/srv_samr.h
index 7d5cdd745d..7d5cdd745d 100644
--- a/source3/librpc/gen_ndr/srv_samr.h
+++ b/librpc/gen_ndr/srv_samr.h
diff --git a/source3/librpc/gen_ndr/srv_srvsvc.c b/librpc/gen_ndr/srv_srvsvc.c
index 59f51ba774..59f51ba774 100644
--- a/source3/librpc/gen_ndr/srv_srvsvc.c
+++ b/librpc/gen_ndr/srv_srvsvc.c
diff --git a/source3/librpc/gen_ndr/srv_srvsvc.h b/librpc/gen_ndr/srv_srvsvc.h
index 1e1ebb1904..1e1ebb1904 100644
--- a/source3/librpc/gen_ndr/srv_srvsvc.h
+++ b/librpc/gen_ndr/srv_srvsvc.h
diff --git a/source3/librpc/gen_ndr/srv_svcctl.c b/librpc/gen_ndr/srv_svcctl.c
index 5b30bf00f7..5b30bf00f7 100644
--- a/source3/librpc/gen_ndr/srv_svcctl.c
+++ b/librpc/gen_ndr/srv_svcctl.c
diff --git a/source3/librpc/gen_ndr/srv_svcctl.h b/librpc/gen_ndr/srv_svcctl.h
index ca63ebe970..ca63ebe970 100644
--- a/source3/librpc/gen_ndr/srv_svcctl.h
+++ b/librpc/gen_ndr/srv_svcctl.h
diff --git a/source3/librpc/gen_ndr/srv_winreg.c b/librpc/gen_ndr/srv_winreg.c
index ac70b41219..ac70b41219 100644
--- a/source3/librpc/gen_ndr/srv_winreg.c
+++ b/librpc/gen_ndr/srv_winreg.c
diff --git a/source3/librpc/gen_ndr/srv_winreg.h b/librpc/gen_ndr/srv_winreg.h
index decfb2589d..decfb2589d 100644
--- a/source3/librpc/gen_ndr/srv_winreg.h
+++ b/librpc/gen_ndr/srv_winreg.h
diff --git a/source3/librpc/gen_ndr/srv_wkssvc.c b/librpc/gen_ndr/srv_wkssvc.c
index 61a5be081f..61a5be081f 100644
--- a/source3/librpc/gen_ndr/srv_wkssvc.c
+++ b/librpc/gen_ndr/srv_wkssvc.c
diff --git a/source3/librpc/gen_ndr/srv_wkssvc.h b/librpc/gen_ndr/srv_wkssvc.h
index f1d0b94c26..f1d0b94c26 100644
--- a/source3/librpc/gen_ndr/srv_wkssvc.h
+++ b/librpc/gen_ndr/srv_wkssvc.h
diff --git a/source3/librpc/gen_ndr/srvsvc.h b/librpc/gen_ndr/srvsvc.h
index 6467f72a5b..6467f72a5b 100644
--- a/source3/librpc/gen_ndr/srvsvc.h
+++ b/librpc/gen_ndr/srvsvc.h
diff --git a/source3/librpc/gen_ndr/svcctl.h b/librpc/gen_ndr/svcctl.h
index 9baa122e56..9baa122e56 100644
--- a/source3/librpc/gen_ndr/svcctl.h
+++ b/librpc/gen_ndr/svcctl.h
diff --git a/source3/librpc/gen_ndr/tables.c b/librpc/gen_ndr/tables.c
index f2064d95ac..f2064d95ac 100644
--- a/source3/librpc/gen_ndr/tables.c
+++ b/librpc/gen_ndr/tables.c
diff --git a/source3/librpc/gen_ndr/winreg.h b/librpc/gen_ndr/winreg.h
index a98120ccf5..a98120ccf5 100644
--- a/source3/librpc/gen_ndr/winreg.h
+++ b/librpc/gen_ndr/winreg.h
diff --git a/source3/librpc/gen_ndr/wkssvc.h b/librpc/gen_ndr/wkssvc.h
index 07b4c40e83..07b4c40e83 100644
--- a/source3/librpc/gen_ndr/wkssvc.h
+++ b/librpc/gen_ndr/wkssvc.h
diff --git a/source3/librpc/gen_ndr/xattr.h b/librpc/gen_ndr/xattr.h
index 1148a0acec..1148a0acec 100644
--- a/source3/librpc/gen_ndr/xattr.h
+++ b/librpc/gen_ndr/xattr.h
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d02246befb..fa5bf8b6a1 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -256,9 +256,9 @@ PASSCHANGE_OBJ = libsmb/passchange.o
 
 LIBNDR_DRSUAPI_OBJ = ../librpc/ndr/ndr_drsuapi.o \
 		     ../librpc/ndr/ndr_compression.o \
-		     librpc/gen_ndr/ndr_drsuapi.o \
+		     ../librpc/gen_ndr/ndr_drsuapi.o \
 		     ../librpc/ndr/ndr_drsblobs.o \
-		     librpc/gen_ndr/ndr_drsblobs.o
+		     ../librpc/gen_ndr/ndr_drsblobs.o
 
 ZLIB_OBJ = @ZLIB_OBJS@
 
@@ -272,8 +272,8 @@ DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
 LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
 	     ../librpc/ndr/ndr.o \
 	     ../librpc/ndr/ndr_misc.o \
-	     librpc/gen_ndr/ndr_misc.o \
-	     librpc/gen_ndr/ndr_security.o \
+	     ../librpc/gen_ndr/ndr_misc.o \
+	     ../librpc/gen_ndr/ndr_security.o \
 	     ../librpc/ndr/ndr_sec_helper.o \
 	     librpc/ndr/ndr_string.o \
 	     librpc/ndr/sid.o \
@@ -282,27 +282,27 @@ LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
 
 RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
 
-LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
-		  librpc/gen_ndr/ndr_lsa.o
+LIBNDR_GEN_OBJ0 = ../librpc/gen_ndr/ndr_samr.o \
+		  ../librpc/gen_ndr/ndr_lsa.o
 
-LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o \
+LIBNDR_GEN_OBJ1 = ../librpc/gen_ndr/ndr_netlogon.o \
 		  ../librpc/ndr/ndr_netlogon.o
 
-LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
+LIBNDR_GEN_OBJ = ../librpc/gen_ndr/ndr_wkssvc.o \
 		 $(LIBNDR_GEN_OBJ0) \
-		 librpc/gen_ndr/ndr_dfs.o \
-		 librpc/gen_ndr/ndr_echo.o \
-		 librpc/gen_ndr/ndr_winreg.o \
-		 librpc/gen_ndr/ndr_initshutdown.o \
-		 librpc/gen_ndr/ndr_srvsvc.o \
-		 librpc/gen_ndr/ndr_eventlog.o \
+		 ../librpc/gen_ndr/ndr_dfs.o \
+		 ../librpc/gen_ndr/ndr_echo.o \
+		 ../librpc/gen_ndr/ndr_winreg.o \
+		 ../librpc/gen_ndr/ndr_initshutdown.o \
+		 ../librpc/gen_ndr/ndr_srvsvc.o \
+		 ../librpc/gen_ndr/ndr_eventlog.o \
 		 $(LIBNDR_GEN_OBJ1) \
-		 librpc/gen_ndr/ndr_dssetup.o \
-		 librpc/gen_ndr/ndr_notify.o \
-		 librpc/gen_ndr/ndr_xattr.o \
-		 librpc/gen_ndr/ndr_epmapper.o \
-		 librpc/gen_ndr/ndr_named_pipe_auth.o \
-		 librpc/gen_ndr/ndr_ntsvcs.o
+		 ../librpc/gen_ndr/ndr_dssetup.o \
+		 ../librpc/gen_ndr/ndr_notify.o \
+		 ../librpc/gen_ndr/ndr_xattr.o \
+		 ../librpc/gen_ndr/ndr_epmapper.o \
+		 ../librpc/gen_ndr/ndr_named_pipe_auth.o \
+		 ../librpc/gen_ndr/ndr_ntsvcs.o
 
 RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
 
@@ -399,15 +399,15 @@ LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
 
 LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
 		    ../librpc/ndr/ndr_krb5pac.o \
-		    librpc/gen_ndr/ndr_krb5pac.o
+		    ../librpc/gen_ndr/ndr_krb5pac.o
 
 SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o
 
 LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
 	     ../libcli/netlogon.o \
 	     ../libcli/ndr_netlogon.o \
-	     librpc/gen_ndr/ndr_nbt.o \
-	     librpc/gen_ndr/ndr_svcctl.o
+	     ../librpc/gen_ndr/ndr_nbt.o \
+	     ../librpc/gen_ndr/ndr_svcctl.o
 
 LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
 	     libsmb/namequery.o libsmb/conncache.o libads/dns.o
@@ -459,21 +459,21 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
 		   librpc/rpc/dcerpc.o \
 		   ../librpc/rpc/binding.o
 
-LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
-		   librpc/gen_ndr/cli_dfs.o \
-		   librpc/gen_ndr/cli_echo.o \
-		   librpc/gen_ndr/cli_srvsvc.o \
-		   librpc/gen_ndr/cli_svcctl.o \
-		   librpc/gen_ndr/cli_winreg.o \
-		   librpc/gen_ndr/cli_initshutdown.o \
-		   librpc/gen_ndr/cli_eventlog.o \
-		   librpc/gen_ndr/cli_wkssvc.o \
-		   librpc/gen_ndr/cli_netlogon.o \
-		   librpc/gen_ndr/cli_samr.o \
-		   librpc/gen_ndr/cli_dssetup.o \
-		   librpc/gen_ndr/cli_ntsvcs.o \
-		   librpc/gen_ndr/cli_epmapper.o \
-		   librpc/gen_ndr/cli_drsuapi.o \
+LIBMSRPC_GEN_OBJ = ../librpc/gen_ndr/cli_lsa.o \
+		   ../librpc/gen_ndr/cli_dfs.o \
+		   ../librpc/gen_ndr/cli_echo.o \
+		   ../librpc/gen_ndr/cli_srvsvc.o \
+		   ../librpc/gen_ndr/cli_svcctl.o \
+		   ../librpc/gen_ndr/cli_winreg.o \
+		   ../librpc/gen_ndr/cli_initshutdown.o \
+		   ../librpc/gen_ndr/cli_eventlog.o \
+		   ../librpc/gen_ndr/cli_wkssvc.o \
+		   ../librpc/gen_ndr/cli_netlogon.o \
+		   ../librpc/gen_ndr/cli_samr.o \
+		   ../librpc/gen_ndr/cli_dssetup.o \
+		   ../librpc/gen_ndr/cli_ntsvcs.o \
+		   ../librpc/gen_ndr/cli_epmapper.o \
+		   ../librpc/gen_ndr/cli_drsuapi.o \
 		   $(LIBNDR_GEN_OBJ) \
 		   $(RPCCLIENT_NDR_OBJ)
 
@@ -527,47 +527,47 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
 	       registry/reg_util_legacy.o
 
 
-RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o
+RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o ../librpc/gen_ndr/srv_lsa.o
 
 RPC_NETLOG_OBJ = rpc_server/srv_netlog_nt.o \
-		 librpc/gen_ndr/srv_netlogon.o
+		 ../librpc/gen_ndr/srv_netlogon.o
 
 RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
                rpc_server/srv_samr_util.o \
-	       librpc/gen_ndr/srv_samr.o
+	       ../librpc/gen_ndr/srv_samr.o
 
-RPC_INITSHUTDOWN_OBJ =  librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
+RPC_INITSHUTDOWN_OBJ =  ../librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
 
 RPC_REG_OBJ =  rpc_server/srv_winreg_nt.o \
-	       librpc/gen_ndr/srv_winreg.o
+	       ../librpc/gen_ndr/srv_winreg.o
 
-RPC_DSSETUP_OBJ =  rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
+RPC_DSSETUP_OBJ =  rpc_server/srv_dssetup_nt.o ../librpc/gen_ndr/srv_dssetup.o
 
 RPC_SVC_OBJ = rpc_server/srv_srvsvc_nt.o \
-	      librpc/gen_ndr/srv_srvsvc.o
+	      ../librpc/gen_ndr/srv_srvsvc.o
 
-RPC_WKS_OBJ =  librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
+RPC_WKS_OBJ =  ../librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
 
 RPC_SVCCTL_OBJ =  rpc_server/srv_svcctl.o rpc_server/srv_svcctl_nt.o \
-		  librpc/gen_ndr/srv_svcctl.o \
+		  ../librpc/gen_ndr/srv_svcctl.o \
                   services/svc_spoolss.o services/svc_rcinit.o services/services_db.o \
                   services/svc_netlogon.o services/svc_winreg.o \
                   services/svc_wins.o
 
 RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs.o rpc_server/srv_ntsvcs_nt.o \
-		 librpc/gen_ndr/srv_ntsvcs.o
+		 ../librpc/gen_ndr/srv_ntsvcs.o
 
-RPC_DFS_OBJ =  librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
+RPC_DFS_OBJ =  ../librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
 
 RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o
 
 RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \
-		   rpc_server/srv_eventlog_lib.o librpc/gen_ndr/srv_eventlog.o
+		   rpc_server/srv_eventlog_lib.o ../librpc/gen_ndr/srv_eventlog.o
 
 RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \
                rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o
 
-RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
+RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o ../librpc/gen_ndr/srv_echo.o
 
 RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ)
 
@@ -998,10 +998,10 @@ NDRDUMP_OBJ = ../librpc/tools/ndrdump.o \
 	      $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \
 	      $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
 		  $(LIBNDR_DRSUAPI_OBJ) $(COMPRESSION_OBJ) \
-	      librpc/gen_ndr/ndr_svcctl.o \
+	      ../librpc/gen_ndr/ndr_svcctl.o \
 		  librpc/gen_ndr/tables.o ../librpc/ndr/ndr_table.o \
 	      ../librpc/ndr/ndr_krb5pac.o \
-		  librpc/gen_ndr/ndr_krb5pac.o ../lib/util/asn1.o
+		  ../librpc/gen_ndr/ndr_krb5pac.o ../lib/util/asn1.o
 
 DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
 
@@ -1227,7 +1227,7 @@ modules:: SHOWFLAGS $(MODULES)
 #####################################################################
 ## Perl IDL Compiler
 samba3-idl::
-	@PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+	@PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
 	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh ../librpc/idl/lsa.idl \
 	 	../librpc/idl/dfs.idl ../librpc/idl/echo.idl ../librpc/idl/winreg.idl \
 		../librpc/idl/initshutdown.idl ../librpc/idl/srvsvc.idl ../librpc/idl/svcctl.idl \