diff --git a/build.xml b/build.xml
index bafb558aad6..0b31ff8ba2e 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,6 @@
  -->
 
 <project name="lucene-solr" default="test" basedir=".">
-  <import file="common-build.xml"/>
   <target name="test" description="Test both Lucene and Solr" depends="validate">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
diff --git a/common-build.xml b/common-build.xml
deleted file mode 100644
index 8b61899acbd..00000000000
--- a/common-build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<project name="all-common" basedir="."
-         xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <dirname file="${ant.file.all-common}" property="all.common.dir"/>
-  <path id="tools.runtime.classpath">
-    <pathelement location="${all.common.dir}/lucene/build/classes/tools"/>
-  </path>
-  <target name="compile-tools" description="Compile the Test Framework and Validation tools">
-    <sequential>
-      <subant target="compile-tools" inheritall="false" failonerror="true">
-        <fileset dir="${all.common.dir}/lucene" includes="build.xml" />
-      </subant>
-    </sequential>
-  </target>
-</project>
\ No newline at end of file
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 1ce62bbb7c8..c2dace95c2c 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -24,7 +24,6 @@
   </description>
 
   <dirname file="${ant.file.common}" property="common.dir"/>
-  <import file="${common.dir}/../common-build.xml"/>
   <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
   <property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
   <property name="maven.build.dir" value="${common.dir}/build/maven"/>
@@ -61,6 +60,11 @@
     <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
   </path>
 
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common.dir}/build/classes/tools"/>
+  </path>
+
+
   <!-- default arguments to pass to JVM executing tests -->
   <property name="testmethod" value=""/>
   <property name="args" value=""/>
diff --git a/modules/analysis/build.xml b/modules/analysis/build.xml
index 19a3c58d17f..4c299f0f7e1 100644
--- a/modules/analysis/build.xml
+++ b/modules/analysis/build.xml
@@ -57,6 +57,13 @@
     <ant dir="smartcn" target="clean" />
     <ant dir="stempel" target="clean" />
   </target>
+  <target name="validate">
+    <ant dir="common" target="validate" />
+    <ant dir="icu" target="validate" />
+    <ant dir="phonetic" target="validate" />
+    <ant dir="smartcn" target="validate" />
+    <ant dir="stempel" target="validate" />
+  </target>
   <target name="compile-core">
     <ant dir="common" target="compile-core" />
     <ant dir="icu" target="compile-core" />
diff --git a/modules/analysis/common/build.xml b/modules/analysis/common/build.xml
index 75e93b58c57..b9c146633aa 100644
--- a/modules/analysis/common/build.xml
+++ b/modules/analysis/common/build.xml
@@ -106,7 +106,7 @@
     </java>
   </target>
 
-  <target name="compile-tools">
+  <target name="compile-tools" depends="common.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">
diff --git a/modules/analysis/icu/build.xml b/modules/analysis/icu/build.xml
index 91823d75195..fd1ea75914e 100644
--- a/modules/analysis/icu/build.xml
+++ b/modules/analysis/icu/build.xml
@@ -125,7 +125,7 @@ are part of the ICU4C package. See http://site.icu-project.org/ </echo>
     </java>
   </target>
 			
-  <target name="compile-tools">
+  <target name="compile-tools" depends="common.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">
diff --git a/modules/build.xml b/modules/build.xml
index 865008bd9ad..c57d55c9a0e 100644
--- a/modules/build.xml
+++ b/modules/build.xml
@@ -18,7 +18,6 @@
  -->
 
 <project name="modules" default="test" basedir=".">
-  <import file="../common-build.xml"/>
   <target name="test" description="Test all modules">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
@@ -30,7 +29,7 @@
     </sequential>
   </target>
 
-  <target name="compile" description="Compile all modules" depends="validate-modules">
+  <target name="compile" description="Compile all modules" depends="validate">
     <sequential>
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
@@ -74,24 +73,15 @@
       </subant>
     </sequential>
   </target>
-  <target name="validate" depends="validate-modules"/>
-  <target name="validate-modules" depends="check-legal-modules" unless="validated-modules"/>
-  <target name="check-legal-modules" depends="compile-tools">
-    <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
-      <classpath>
-        <path refid="tools.runtime.classpath" />
-      </classpath>
-      <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
-       long time.  This should be faster, but we could miss a directory
-       -->
-      <!-- Modules -->
-      <arg value="-c" />
-      <arg value="${basedir}/analysis/icu/lib" />
-      <arg value="-c" />
-      <arg value="${basedir}/analysis/phonetic/lib" />
-      <arg value="-c" />
-      <arg value="${basedir}/benchmark/lib" />
-    </java>
+  <target name="validate">
+     <sequential>
+      <subant target="validate" inheritall="false" failonerror="true">
+        <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="grouping" includes="build.xml" />
+        <fileset dir="suggest" includes="build.xml" />
+      </subant>
+    </sequential>
   </target>
 
   <target name="clean" description="Clean all modules">
diff --git a/solr/common-build.xml b/solr/common-build.xml
index c111d7106a1..cdda84e1936 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -22,7 +22,6 @@
   </description>
 
   <dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
-  <import file="${common-solr.dir}/../common-build.xml"/>
   
   <!-- change this together with the default and test's solrconfig.xml after starting a new development branch: -->
   <property name="tests.luceneMatchVersion" value="4.0"/>
@@ -636,4 +635,16 @@
     </java>
   </target>
 
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common-solr.dir}/../lucene/build/classes/tools"/>
+  </path>
+  <target name="compile-tools" description="Compile the Test Framework and Validation tools">
+    <sequential>
+      <subant target="compile-tools" inheritall="false" failonerror="true">
+        <fileset dir="${common-solr.dir}/../lucene" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+
 </project>