7 files changed, 6 insertions, 7 deletions
diff --git a/source4/build/pidl/template.pm b/source4/build/pidl/template.pm
index 27f5d0c277..d2f945cf2b 100644
--- a/source4/build/pidl/template.pm
+++ b/source4/build/pidl/template.pm
@@ -43,7 +43,6 @@ sub Template($)
 #include \"includes.h\"
 #include \"rpc_server/dcerpc_server.h\"
 #include \"librpc/gen_ndr/ndr_$name.h\"
-#include \"rpc_server/common/common.h\"
 
 ";
 
diff --git a/source4/build/pidl/tests/ndr_align.pl b/source4/build/pidl/tests/ndr_align.pl
index 1796c045f5..2cd4bde185 100755
--- a/source4/build/pidl/tests/ndr_align.pl
+++ b/source4/build/pidl/tests/ndr_align.pl
@@ -5,7 +5,7 @@ use strict;
 
 use FindBin qw($RealBin);
 use lib "$RealBin/../..";
-use test;
+use pidl::test;
 
 my %settings = Test::GetSettings(@ARGV);
 
diff --git a/source4/build/pidl/tests/ndr_alloc.pl b/source4/build/pidl/tests/ndr_alloc.pl
index d382759930..f0f366a947 100755
--- a/source4/build/pidl/tests/ndr_alloc.pl
+++ b/source4/build/pidl/tests/ndr_alloc.pl
@@ -5,7 +5,7 @@ use strict;
 
 use FindBin qw($RealBin);
 use lib "$RealBin/../..";
-use test;
+use pidl::test;
 
 my %settings = Test::GetSettings(@ARGV);
 $settings{'IDL-Arguments'} = ['--quiet', '--parse', '--parser=ndr_test.c', '--header=ndr_test.h'];
diff --git a/source4/build/pidl/tests/ndr_array.pl b/source4/build/pidl/tests/ndr_array.pl
index bd78f3432a..3012868315 100755
--- a/source4/build/pidl/tests/ndr_array.pl
+++ b/source4/build/pidl/tests/ndr_array.pl
@@ -6,7 +6,7 @@ use strict;
 
 use FindBin qw($RealBin);
 use lib "$RealBin/../..";
-use test;
+use pidl::test;
 
 my %settings = Test::GetSettings(@ARGV);
 $settings{'IDL-Arguments'} = ['--quiet', '--parse', '--parser=ndr_test.c', '--header=ndr_test.h'];
diff --git a/source4/build/pidl/tests/ndr_refptr.pl b/source4/build/pidl/tests/ndr_refptr.pl
index d42a34d1b0..8654174bfe 100755
--- a/source4/build/pidl/tests/ndr_refptr.pl
+++ b/source4/build/pidl/tests/ndr_refptr.pl
@@ -7,7 +7,7 @@ use strict;
 
 use FindBin qw($RealBin);
 use lib "$RealBin/../..";
-use test;
+use pidl::test;
 
 my %settings = Test::GetSettings(@ARGV);
 $settings{'IDL-Arguments'} = ['--quiet', '--parse', '--parser=ndr_test.c', '--header=ndr_test.h'];
diff --git a/source4/build/pidl/tests/ndr_simple.pl b/source4/build/pidl/tests/ndr_simple.pl
index de2f34383e..b1930c45b6 100755
--- a/source4/build/pidl/tests/ndr_simple.pl
+++ b/source4/build/pidl/tests/ndr_simple.pl
@@ -6,7 +6,7 @@ use strict;
 
 use FindBin qw($RealBin);
 use lib "$RealBin/../..";
-use test;
+use pidl::test;
 
 my %settings = Test::GetSettings(@ARGV);
 $settings{'IDL-Arguments'} = ['--quiet', '--parse', '--parser=ndr_test.c', '--header=ndr_test.h'];
diff --git a/source4/build/pidl/tests/ndr_string.pl b/source4/build/pidl/tests/ndr_string.pl
index 1c75eb90cc..c011a29028 100755
--- a/source4/build/pidl/tests/ndr_string.pl
+++ b/source4/build/pidl/tests/ndr_string.pl
@@ -6,7 +6,7 @@ use strict;
 
 use FindBin qw($RealBin);
 use lib "$RealBin/../..";
-use test;
+use pidl::test;
 
 my %settings = Test::GetSettings(@ARGV);