diff --git a/src/records/definitions/area_format_record.xml b/src/records/definitions/area_format_record.xml
index c442b69eaf..3fc2a9c189 100644
--- a/src/records/definitions/area_format_record.xml
+++ b/src/records/definitions/area_format_record.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="0x100a" name="AreaFormat" excel-record-id="AREAFORMAT" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/area_record.xml b/src/records/definitions/area_record.xml
index 8946ab5665..16f04e15f2 100644
--- a/src/records/definitions/area_record.xml
+++ b/src/records/definitions/area_record.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="Area" excel-record-id="AREA"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/attached_label_record.xml b/src/records/definitions/attached_label_record.xml
index d21b8c2c03..e2e59e8e8b 100644
--- a/src/records/definitions/attached_label_record.xml
+++ b/src/records/definitions/attached_label_record.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="0x100c" name="SeriesLabels" excel-record-id="ATTACHEDLABEL"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/axes_used_record.xml b/src/records/definitions/axes_used_record.xml
index 54cc2138db..cd8cf1065f 100644
--- a/src/records/definitions/axes_used_record.xml
+++ b/src/records/definitions/axes_used_record.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="0x1046" name="AxisUsed" excel-record-id="AXISUSED"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/axis_line_format_record.xml b/src/records/definitions/axis_line_format_record.xml
index b7b94d4af0..ff0fc4d392 100644
--- a/src/records/definitions/axis_line_format_record.xml
+++ b/src/records/definitions/axis_line_format_record.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="0x1021" name="AxisLineFormat" excel-record-id="AXISLINEFORMAT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/axis_options_record.xml b/src/records/definitions/axis_options_record.xml
index bd15b2c9a5..0100f6e1a1 100644
--- a/src/records/definitions/axis_options_record.xml
+++ b/src/records/definitions/axis_options_record.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="0x1062" name="AxisOptions" excel-record-id="AXCEXT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/axis_parent_record.xml b/src/records/definitions/axis_parent_record.xml
index eb52b462c8..22532a81cd 100644
--- a/src/records/definitions/axis_parent_record.xml
+++ b/src/records/definitions/axis_parent_record.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="0x1041" name="AxisParent" excel-record-id="AXISPARENT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/axis_record.xml b/src/records/definitions/axis_record.xml
index 437d13d81a..b03c23f777 100644
--- a/src/records/definitions/axis_record.xml
+++ b/src/records/definitions/axis_record.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="0x101d" name="Axis" excel-record-id="AXIS" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/bar_record.xml b/src/records/definitions/bar_record.xml
index 9e2d22e2c1..9fffd79fa7 100644
--- a/src/records/definitions/bar_record.xml
+++ b/src/records/definitions/bar_record.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="0x1017" name="Bar" excel-record-id="BAR"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/category_series_axis_record.xml b/src/records/definitions/category_series_axis_record.xml
index 229bfd14c0..94088b5a79 100644
--- a/src/records/definitions/category_series_axis_record.xml
+++ b/src/records/definitions/category_series_axis_record.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="0x1020" name="CategorySeriesAxis" excel-record-id="CATSERRANGE"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/chart_record.xml b/src/records/definitions/chart_record.xml
index 729198a8f5..f1bd8fc9d9 100644
--- a/src/records/definitions/chart_record.xml
+++ b/src/records/definitions/chart_record.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="0x1002" name="Chart" excel-record-id="CHART"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/common_object_data_record.xml b/src/records/definitions/common_object_data_record.xml
index 09ef48f1c0..ad7ebfd183 100644
--- a/src/records/definitions/common_object_data_record.xml
+++ b/src/records/definitions/common_object_data_record.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="0x15" name="CommonObjectData" excel-record-id="ftCmo"
     package="org.apache.poi.hssf.record">
     <suffix>SubRecord</suffix>
diff --git a/src/records/definitions/dat_record.xml b/src/records/definitions/dat_record.xml
index ce52bec3b3..bda909ea5a 100644
--- a/src/records/definitions/dat_record.xml
+++ b/src/records/definitions/dat_record.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="0x1063" name="Dat" excel-record-id="DAT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/dataformat_record.xml b/src/records/definitions/dataformat_record.xml
index c58039df58..3720e24ff8 100644
--- a/src/records/definitions/dataformat_record.xml
+++ b/src/records/definitions/dataformat_record.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="0x1006" name="DataFormat"  excel-record-id="DATAFORMAT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/default_data_label_text_properties_record.xml b/src/records/definitions/default_data_label_text_properties_record.xml
index 2c53406d38..9a0e755bd5 100644
--- a/src/records/definitions/default_data_label_text_properties_record.xml
+++ b/src/records/definitions/default_data_label_text_properties_record.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="0x1024" name="DefaultDataLabelTextProperties"
     excel-record-id="DEFAULTTEXT" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/font_basis_record.xml b/src/records/definitions/font_basis_record.xml
index aed1d693a0..e16b292fe8 100644
--- a/src/records/definitions/font_basis_record.xml
+++ b/src/records/definitions/font_basis_record.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="0x1060" name="FontBasis" excel-record-id="FBI"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/font_example.xml b/src/records/definitions/font_example.xml
index aede3b827d..9bf54470a6 100644
--- a/src/records/definitions/font_example.xml
+++ b/src/records/definitions/font_example.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="0x31" name="Font"  excel-record-id="FONT" package="org.apache.poi.hssf.records">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/font_index_record.xml b/src/records/definitions/font_index_record.xml
index 537bccb173..bac26e2cb9 100644
--- a/src/records/definitions/font_index_record.xml
+++ b/src/records/definitions/font_index_record.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="0x1026" name="FontIndex" excel-record-id="FONTX"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/frame_record.xml b/src/records/definitions/frame_record.xml
index 45e8ea957a..b3b033998c 100644
--- a/src/records/definitions/frame_record.xml
+++ b/src/records/definitions/frame_record.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="0x1032" name="Frame" excel-record-id="FRAME"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/ftend_record.xml b/src/records/definitions/ftend_record.xml
index 3c6c43b672..45f9d59bfe 100644
--- a/src/records/definitions/ftend_record.xml
+++ b/src/records/definitions/ftend_record.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="0x00" name="End" excel-record-id="ftEnd"
     package="org.apache.poi.hssf.record">
     <suffix>SubRecord</suffix>
diff --git a/src/records/definitions/legend_record.xml b/src/records/definitions/legend_record.xml
index 17030d48ca..577443e960 100644
--- a/src/records/definitions/legend_record.xml
+++ b/src/records/definitions/legend_record.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="0x1015" name="Legend" excel-record-id="LEGEND"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/line_format_record.xml b/src/records/definitions/line_format_record.xml
index b8df1fe88b..f55679fcef 100644
--- a/src/records/definitions/line_format_record.xml
+++ b/src/records/definitions/line_format_record.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="0x1007" name="LineFormat" excel-record-id="LINEFORMAT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/linked_data_record.xml b/src/records/definitions/linked_data_record.xml
index edfe12ffd8..b4b31998fe 100644
--- a/src/records/definitions/linked_data_record.xml
+++ b/src/records/definitions/linked_data_record.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="0x1051" name="LinkedData" excel-record-id="AI" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/number_format_index_record.xml b/src/records/definitions/number_format_index_record.xml
index 019773e042..08d5f5c7fa 100644
--- a/src/records/definitions/number_format_index_record.xml
+++ b/src/records/definitions/number_format_index_record.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="0x104e" name="NumberFormatIndex" excel-record-id="IFMT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/object_link_record.xml b/src/records/definitions/object_link_record.xml
index 36f20f24f8..03848bb8f2 100644
--- a/src/records/definitions/object_link_record.xml
+++ b/src/records/definitions/object_link_record.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="0x1027" name="ObjectLink" excel-record-id="OBJECTLINK"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/pane_record.xml b/src/records/definitions/pane_record.xml
index 85bc758100..c6f93b675c 100644
--- a/src/records/definitions/pane_record.xml
+++ b/src/records/definitions/pane_record.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="0x41" name="Pane" excel-record-id="PANE" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/plot_area_record.xml b/src/records/definitions/plot_area_record.xml
index cba230fdb0..300492a4cc 100644
--- a/src/records/definitions/plot_area_record.xml
+++ b/src/records/definitions/plot_area_record.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="0x1035" name="PlotArea" excel-record-id="PLOTAREA"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/plotgrowth_record.xml b/src/records/definitions/plotgrowth_record.xml
index bc6ef67437..469b9816b4 100644
--- a/src/records/definitions/plotgrowth_record.xml
+++ b/src/records/definitions/plotgrowth_record.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="0x1064" name="PlotGrowth" excel-record-id="PLOTGROWTH"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/scl_record.xml b/src/records/definitions/scl_record.xml
index 094e9d37af..abe21b15ba 100644
--- a/src/records/definitions/scl_record.xml
+++ b/src/records/definitions/scl_record.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="0xa0" name="SCL" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/series_chart_group_record.xml b/src/records/definitions/series_chart_group_record.xml
index 92e739bf83..84338f144f 100644
--- a/src/records/definitions/series_chart_group_record.xml
+++ b/src/records/definitions/series_chart_group_record.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="0x1045" name="SeriesChartGroupIndex"  excel-record-id="SERTOCRT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/series_index_record.xml b/src/records/definitions/series_index_record.xml
index 854173d78b..a35e019252 100644
--- a/src/records/definitions/series_index_record.xml
+++ b/src/records/definitions/series_index_record.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="0x1065" name="SeriesIndex" excel-record-id="SINDEX"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/series_list_record.xml b/src/records/definitions/series_list_record.xml
index 860eb20d12..88eeb67046 100644
--- a/src/records/definitions/series_list_record.xml
+++ b/src/records/definitions/series_list_record.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="0x1016" name="SeriesList" excel-record-id="SERIESLIST"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/series_record.xml b/src/records/definitions/series_record.xml
index 577c23c7fb..e6d516410d 100644
--- a/src/records/definitions/series_record.xml
+++ b/src/records/definitions/series_record.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="0x1003" name="Series" excel-record-id="SERIES" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/series_text_record.xml b/src/records/definitions/series_text_record.xml
index b930db2080..f86aa2da87 100644
--- a/src/records/definitions/series_text_record.xml
+++ b/src/records/definitions/series_text_record.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="0x100d" name="SeriesText" excel-record-id="SERIESTEXT"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/sertocrt_record.xml b/src/records/definitions/sertocrt_record.xml
index 3782a59ccf..a904e96c85 100644
--- a/src/records/definitions/sertocrt_record.xml
+++ b/src/records/definitions/sertocrt_record.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="0x1045" name="SeriesToChartGroup" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/sheet_properties_record.xml b/src/records/definitions/sheet_properties_record.xml
index 9b069298b4..97c5300e76 100644
--- a/src/records/definitions/sheet_properties_record.xml
+++ b/src/records/definitions/sheet_properties_record.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="0x1044" name="SheetProperties" excel-record-id="SHTPROPS" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/subrecord.xsl b/src/records/definitions/subrecord.xsl
index 69db247094..01016bc6b2 100644
--- a/src/records/definitions/subrecord.xsl
+++ b/src/records/definitions/subrecord.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="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.generator.RecordUtil"
+   xmlns:field="org.apache.poi.generator.FieldIterator"
+   xmlns:java="java" >
+
+<xsl:template match="record">
 
 <xsl:if test="@package">
 package <xsl:value-of select="@package"/>;
diff --git a/src/records/definitions/subrecord_test.xsl b/src/records/definitions/subrecord_test.xsl
index 3942cd22ed..c729b41309 100644
--- a/src/records/definitions/subrecord_test.xsl
+++ b/src/records/definitions/subrecord_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="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.generator.RecordUtil"
+   xmlns:field="org.apache.poi.generator.FieldIterator"
+   xmlns:java="java" >
+
+<xsl:template match="record">
 
 <xsl:if test="@package">
 package <xsl:value-of select="@package"/>;
diff --git a/src/records/definitions/text_record.xml b/src/records/definitions/text_record.xml
index 941099b882..c486a7fd9e 100644
--- a/src/records/definitions/text_record.xml
+++ b/src/records/definitions/text_record.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="0x1025" name="Text" excel-record-id="TEXT" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/textobject_record.xml b/src/records/definitions/textobject_record.xml
index 46aed0e048..8e7e6e83ca 100644
--- a/src/records/definitions/textobject_record.xml
+++ b/src/records/definitions/textobject_record.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="0x1B6" name="TextObjectBase" excel-record-id="TXO"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/definitions/tick_record.xml b/src/records/definitions/tick_record.xml
index e692aba68e..d1f704a7c8 100644
--- a/src/records/definitions/tick_record.xml
+++ b/src/records/definitions/tick_record.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="0x101e" name="Tick" excel-record-id="TICK" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/units_record.xml b/src/records/definitions/units_record.xml
index 4b9c39acd5..ff281265a3 100644
--- a/src/records/definitions/units_record.xml
+++ b/src/records/definitions/units_record.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="0x1001" name="Units" excel-record-id="UNITS" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
diff --git a/src/records/definitions/value_range_record.xml b/src/records/definitions/value_range_record.xml
index 67ae8f22bf..c5be1d8192 100644
--- a/src/records/definitions/value_range_record.xml
+++ b/src/records/definitions/value_range_record.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="0x101f" name="ValueRange" excel-record-id="VALUERANGE"
     package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
diff --git a/src/records/styles/record.xsl b/src/records/styles/record.xsl
index 8f4989a590..dae346b5dc 100644
--- a/src/records/styles/record.xsl
+++ b/src/records/styles/record.xsl
@@ -1,13 +1,7 @@
 <<<<<<< record.xsl
-<!-- 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="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.
@@ -22,7 +16,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="record">
 
 <xsl:if test="@package">
 package <xsl:value-of select="@package"/>;
diff --git a/src/records/styles/record_document.xsl b/src/records/styles/record_document.xsl
index 6eaee82681..1024aaaadc 100644
--- a/src/records/styles/record_document.xsl
+++ b/src/records/styles/record_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/records/styles/record_test.xsl b/src/records/styles/record_test.xsl
index fc7f62c41c..a70a9491b7 100644
--- a/src/records/styles/record_test.xsl
+++ b/src/records/styles/record_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="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.generator.RecordUtil"
+   xmlns:field="org.apache.poi.generator.FieldIterator"
+   xmlns:java="java" >
+
+<xsl:template match="record">
 
 <xsl:if test="@package">
 package <xsl:value-of select="@package"/>;