diff --git a/build.xml b/build.xml
index 5a1d4678b5..244aaddcbb 100644
--- a/build.xml
+++ b/build.xml
@@ -698,7 +698,17 @@ under the License.
             </replace>
 
             <copy todir="${xmlbean.sources.dir}">
-                <file basedir="${ooxml.src}" file="${ooxml.src}/org/apache/poi/POIXMLTypeLoader.java"/>
+            	<fileset dir="${ooxml.src}">
+            		<include name="org/apache/poi/POIXMLTypeLoader.java"/>
+            		<include name="org/apache/poi/util/DocumentHelper.java"/>
+            		<include name="org/apache/poi/util/SAXHelper.java"/>
+            	</fileset>
+            	<fileset dir="${main.src}">
+            		<include name="org/apache/poi/util/POILogFactory.java"/>
+            		<include name="org/apache/poi/util/POILogger.java"/>
+                    <include name="org/apache/poi/util/NullLogger.java"/>
+                    <include name="org/apache/poi/util/Internal.java"/>
+            	</fileset>
             </copy>
 
             <javac target="${jdk.version.class}"
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 19061e98de..3db481e8c2 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -198,7 +198,17 @@
                 <configuration>
                   <target>
                     <copy todir="${basedir}/target/generated-sources/xmlbeans">
-                      <fileset dir="${basedir}/../../src/ooxml/java" includes="org/apache/poi/POIXMLTypeLoader.java"/>
+                      <fileset dir="${basedir}/../../src/ooxml/java">
+                        <include name="org/apache/poi/POIXMLTypeLoader.java"/>
+                        <include name="org/apache/poi/util/DocumentHelper.java"/>
+                        <include name="org/apache/poi/util/SAXHelper.java"/>
+                      </fileset>
+                      <fileset dir="${basedir}/../../src/java">
+                        <include name="org/apache/poi/util/POILogFactory.java"/>
+                        <include name="org/apache/poi/util/POILogger.java"/>
+                        <include name="org/apache/poi/util/NullLogger.java"/>
+                        <include name="org/apache/poi/util/Internal.java"/>
+                      </fileset>
                     </copy>
                     <copy todir="${basedir}/target/schemas">
                       <fileset dir="${basedir}/../../src/ooxml/resources/org/apache/poi/schemas"/>