diff --git a/src/types/definitions/chp_type.xml b/src/types/definitions/chp_type.xml
index 0f0e2c775..51ef9d88c 100644
--- a/src/types/definitions/chp_type.xml
+++ b/src/types/definitions/chp_type.xml
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <record id="0x101B" name="CHP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
diff --git a/src/types/definitions/dop_type.xml b/src/types/definitions/dop_type.xml
index badde44e8..77de331bf 100644
--- a/src/types/definitions/dop_type.xml
+++ b/src/types/definitions/dop_type.xml
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <record fromfile="true" name="DOP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
diff --git a/src/types/definitions/fib_type.xml b/src/types/definitions/fib_type.xml
index 7e02b44ae..fe3f11d9d 100644
--- a/src/types/definitions/fib_type.xml
+++ b/src/types/definitions/fib_type.xml
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <record fromfile="true" name="FIB" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
diff --git a/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml
index 3bee953b0..0f26352f9 100644
--- a/src/types/definitions/pap_type.xml
+++ b/src/types/definitions/pap_type.xml
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <record id="0x101A" name="PAP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
diff --git a/src/types/definitions/sep_type.xml b/src/types/definitions/sep_type.xml
index 5a2528f88..a98713176 100644
--- a/src/types/definitions/sep_type.xml
+++ b/src/types/definitions/sep_type.xml
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <record id="0x101B" name="SEP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
diff --git a/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml
index f5582daae..acde8590e 100644
--- a/src/types/definitions/tap_type.xml
+++ b/src/types/definitions/tap_type.xml
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <record id="0x101B" name="TAP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
diff --git a/src/types/definitions/tc_type.xml b/src/types/definitions/tc_type.xml
index 4c0146b46..6a7707320 100644
--- a/src/types/definitions/tc_type.xml
+++ b/src/types/definitions/tc_type.xml
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <record fromfile="true" id="0x101B" name="TC" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
diff --git a/src/types/styles/hdftype.xsl b/src/types/styles/hdftype.xsl
index 93f49c554..7562f9b5b 100644
--- a/src/types/styles/hdftype.xsl
+++ b/src/types/styles/hdftype.xsl
@@ -1,12 +1,6 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.hdf.generator.HDFRecordUtil"
-   xmlns:field="org.apache.poi.hdf.generator.HDFFieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="record">
-/* ====================================================================
+<?xml version="1.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.
@@ -21,7 +15,15 @@
    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.
-==================================================================== */
+   ====================================================================
+-->
+<xsl:stylesheet version="1.0"
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   xmlns:recutil="org.apache.poi.hdf.generator.HDFRecordUtil"
+   xmlns:field="org.apache.poi.hdf.generator.HDFFieldIterator"
+   xmlns:java="java" >
+
+<xsl:template match="record">
 
 <xsl:if test="@package">
 package <xsl:value-of select="@package"/>;
diff --git a/src/types/styles/hdftype_document.xsl b/src/types/styles/hdftype_document.xsl
index cf36ca31c..8eed6b60e 100644
--- a/src/types/styles/hdftype_document.xsl
+++ b/src/types/styles/hdftype_document.xsl
@@ -1,4 +1,22 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<?xml version="1.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.
+   ====================================================================
+-->
 <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    xmlns:recutil="org.apache.poi.generator.RecordUtil"
diff --git a/src/types/styles/hdftype_test.xsl b/src/types/styles/hdftype_test.xsl
index 0e864784c..d95c81bb3 100644
--- a/src/types/styles/hdftype_test.xsl
+++ b/src/types/styles/hdftype_test.xsl
@@ -1,12 +1,6 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:recutil="org.apache.poi.generator.RecordUtil"
-   xmlns:field="org.apache.poi.generator.FieldIterator"
-   xmlns:java="java" >
-
-<xsl:template match="type">
-/* ====================================================================
+<?xml version="1.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.
@@ -21,7 +15,15 @@
    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.
-==================================================================== */
+   ====================================================================
+-->
+<xsl:stylesheet version="1.0"
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   xmlns:recutil="org.apache.poi.generator.RecordUtil"
+   xmlns:field="org.apache.poi.generator.FieldIterator"
+   xmlns:java="java" >
+
+<xsl:template match="type">
 
 <xsl:if test="@package">
 package <xsl:value-of select="@package"/>;