Additionally license under Apache License version 2.0

The Apache License version 2.0 is now the primary license for qpdf.
However, users may, at their option, continue to use Artistic version
2.0.

29 files changed, 532 insertions, 131 deletions

diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh
index af066f3c..723e7126 100644
--- a/include/qpdf/Buffer.hh
+++ b/include/qpdf/Buffer.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __BUFFER_HH__
 #define __BUFFER_HH__
diff --git a/include/qpdf/BufferInputSource.hh b/include/qpdf/BufferInputSource.hh
index e2a6feaa..91017cd6 100644
--- a/include/qpdf/BufferInputSource.hh
+++ b/include/qpdf/BufferInputSource.hh
@@ -1,10 +1,23 @@
-/* Copyright (c) 2005-2017 Jay Berkenbilt
- *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
- */
+// Copyright (c) 2005-2017 Jay Berkenbilt
+//
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDF_BUFFERINPUTSOURCE_HH__
 #define __QPDF_BUFFERINPUTSOURCE_HH__
diff --git a/include/qpdf/Constants.h b/include/qpdf/Constants.h
index 262fe9ef..e0642176 100644
--- a/include/qpdf/Constants.h
+++ b/include/qpdf/Constants.h
@@ -1,9 +1,23 @@
 /* Copyright (c) 2005-2017 Jay Berkenbilt
  *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
+ * This file is part of qpdf.
+ *
+ * Licensed 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.
+ *
+ * Versions of qpdf prior to version 7 were released under the terms
+ * of version 2.0 of the Artistic License. At your option, you may
+ * continue to consider qpdf to be licensed under those terms. Please
+ * see the manual for additional information.
  */
 
 #ifndef __QPDFCONSTANTS_H__
diff --git a/include/qpdf/DLL.h b/include/qpdf/DLL.h
index 605a6a8a..1ccc1bb7 100644
--- a/include/qpdf/DLL.h
+++ b/include/qpdf/DLL.h
@@ -1,9 +1,23 @@
 /* Copyright (c) 2005-2017 Jay Berkenbilt
  *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
+ * This file is part of qpdf.
+ *
+ * Licensed 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.
+ *
+ * Versions of qpdf prior to version 7 were released under the terms
+ * of version 2.0 of the Artistic License. At your option, you may
+ * continue to consider qpdf to be licensed under those terms. Please
+ * see the manual for additional information.
  */
 
 #ifndef __QPDF_DLL_HH__
diff --git a/include/qpdf/FileInputSource.hh b/include/qpdf/FileInputSource.hh
index e5c9b317..8aed26f4 100644
--- a/include/qpdf/FileInputSource.hh
+++ b/include/qpdf/FileInputSource.hh
@@ -1,10 +1,23 @@
-/* Copyright (c) 2005-2017 Jay Berkenbilt
- *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
- */
+// Copyright (c) 2005-2017 Jay Berkenbilt
+//
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDF_FILEINPUTSOURCE_HH__
 #define __QPDF_FILEINPUTSOURCE_HH__
diff --git a/include/qpdf/InputSource.hh b/include/qpdf/InputSource.hh
index 87483373..7a52b43c 100644
--- a/include/qpdf/InputSource.hh
+++ b/include/qpdf/InputSource.hh
@@ -1,10 +1,23 @@
-/* Copyright (c) 2005-2017 Jay Berkenbilt
- *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
- */
+// Copyright (c) 2005-2017 Jay Berkenbilt
+//
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDF_INPUTSOURCE_HH__
 #define __QPDF_INPUTSOURCE_HH__
diff --git a/include/qpdf/Pipeline.hh b/include/qpdf/Pipeline.hh
index 8f21f6c6..c1d9eaba 100644
--- a/include/qpdf/Pipeline.hh
+++ b/include/qpdf/Pipeline.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 // Generalized Pipeline interface.  By convention, subclasses of
 // Pipeline are called Pl_Something.
diff --git a/include/qpdf/Pl_Buffer.hh b/include/qpdf/Pl_Buffer.hh
index 02561e7f..3e26f060 100644
--- a/include/qpdf/Pl_Buffer.hh
+++ b/include/qpdf/Pl_Buffer.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __PL_BUFFER_HH__
 #define __PL_BUFFER_HH__
diff --git a/include/qpdf/Pl_Concatenate.hh b/include/qpdf/Pl_Concatenate.hh
index 2b965c40..299c14fd 100644
--- a/include/qpdf/Pl_Concatenate.hh
+++ b/include/qpdf/Pl_Concatenate.hh
@@ -1,10 +1,23 @@
-/* Copyright (c) 2005-2017 Jay Berkenbilt
- *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
- */
+// Copyright (c) 2005-2017 Jay Berkenbilt
+//
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __PL_CONCATENATE_HH__
 #define __PL_CONCATENATE_HH__
diff --git a/include/qpdf/Pl_Count.hh b/include/qpdf/Pl_Count.hh
index 332ef852..94b3a2a8 100644
--- a/include/qpdf/Pl_Count.hh
+++ b/include/qpdf/Pl_Count.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __PL_COUNT_HH__
 #define __PL_COUNT_HH__
diff --git a/include/qpdf/Pl_DCT.hh b/include/qpdf/Pl_DCT.hh
index f9f6dbf4..bbdd2f58 100644
--- a/include/qpdf/Pl_DCT.hh
+++ b/include/qpdf/Pl_DCT.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __PL_DCT_HH__
 #define __PL_DCT_HH__
diff --git a/include/qpdf/Pl_Discard.hh b/include/qpdf/Pl_Discard.hh
index 615b40d6..3a7d2a26 100644
--- a/include/qpdf/Pl_Discard.hh
+++ b/include/qpdf/Pl_Discard.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __PL_DISCARD_HH__
 #define __PL_DISCARD_HH__
diff --git a/include/qpdf/Pl_Flate.hh b/include/qpdf/Pl_Flate.hh
index ea647206..28cc401c 100644
--- a/include/qpdf/Pl_Flate.hh
+++ b/include/qpdf/Pl_Flate.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __PL_FLATE_HH__
 #define __PL_FLATE_HH__
diff --git a/include/qpdf/Pl_RunLength.hh b/include/qpdf/Pl_RunLength.hh
index e7cad8f1..9ebdb150 100644
--- a/include/qpdf/Pl_RunLength.hh
+++ b/include/qpdf/Pl_RunLength.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __PL_RUNLENGTH_HH__
 #define __PL_RUNLENGTH_HH__
diff --git a/include/qpdf/Pl_StdioFile.hh b/include/qpdf/Pl_StdioFile.hh
index 1a16f243..170f2a6a 100644
--- a/include/qpdf/Pl_StdioFile.hh
+++ b/include/qpdf/Pl_StdioFile.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 // End-of-line pipeline that simply writes its data to a stdio FILE* object.
 
diff --git a/include/qpdf/PointerHolder.hh b/include/qpdf/PointerHolder.hh
index 3a4e8e18..59a70306 100644
--- a/include/qpdf/PointerHolder.hh
+++ b/include/qpdf/PointerHolder.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __POINTERHOLDER_HH__
 #define __POINTERHOLDER_HH__
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index ddd82b4d..033c9efd 100644
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDF_HH__
 #define __QPDF_HH__
diff --git a/include/qpdf/QPDFExc.hh b/include/qpdf/QPDFExc.hh
index 32a8076a..1df0a699 100644
--- a/include/qpdf/QPDFExc.hh
+++ b/include/qpdf/QPDFExc.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDFEXC_HH__
 #define __QPDFEXC_HH__
diff --git a/include/qpdf/QPDFObjGen.hh b/include/qpdf/QPDFObjGen.hh
index 9f7bf008..742499ad 100644
--- a/include/qpdf/QPDFObjGen.hh
+++ b/include/qpdf/QPDFObjGen.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDFOBJGEN_HH__
 #define __QPDFOBJGEN_HH__
diff --git a/include/qpdf/QPDFObject.hh b/include/qpdf/QPDFObject.hh
index 2ab04899..66270e07 100644
--- a/include/qpdf/QPDFObject.hh
+++ b/include/qpdf/QPDFObject.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDFOBJECT_HH__
 #define __QPDFOBJECT_HH__
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index 79d83851..7a1c2253 100644
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDFOBJECTHANDLE_HH__
 #define __QPDFOBJECTHANDLE_HH__
diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh
index 23f7910d..2a48b059 100644
--- a/include/qpdf/QPDFTokenizer.hh
+++ b/include/qpdf/QPDFTokenizer.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDFTOKENIZER_HH__
 #define __QPDFTOKENIZER_HH__
diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh
index aa72914f..1fbb33be 100644
--- a/include/qpdf/QPDFWriter.hh
+++ b/include/qpdf/QPDFWriter.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 // This class implements a simple writer for saving QPDF objects to
 // new PDF files.  See comments through the header file for additional
diff --git a/include/qpdf/QPDFXRefEntry.hh b/include/qpdf/QPDFXRefEntry.hh
index ec7ded94..84c1038a 100644
--- a/include/qpdf/QPDFXRefEntry.hh
+++ b/include/qpdf/QPDFXRefEntry.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QPDFXREFENTRY_HH__
 #define __QPDFXREFENTRY_HH__
diff --git a/include/qpdf/QTC.hh b/include/qpdf/QTC.hh
index dd8d516b..5dc1b6d0 100644
--- a/include/qpdf/QTC.hh
+++ b/include/qpdf/QTC.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QTC_HH__
 #define __QTC_HH__
diff --git a/include/qpdf/QUtil.hh b/include/qpdf/QUtil.hh
index 79db229f..81a38aae 100644
--- a/include/qpdf/QUtil.hh
+++ b/include/qpdf/QUtil.hh
@@ -1,9 +1,23 @@
 // Copyright (c) 2005-2017 Jay Berkenbilt
 //
-// This file is part of qpdf.  This software may be distributed under
-// the terms of version 2 of the Artistic License which may be found
-// in the source distribution.  It is provided "as is" without express
-// or implied warranty.
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __QUTIL_HH__
 #define __QUTIL_HH__
diff --git a/include/qpdf/RandomDataProvider.hh b/include/qpdf/RandomDataProvider.hh
index 9b99c087..b719a84c 100644
--- a/include/qpdf/RandomDataProvider.hh
+++ b/include/qpdf/RandomDataProvider.hh
@@ -1,10 +1,23 @@
-/* Copyright (c) 2005-2017 Jay Berkenbilt
- *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
- */
+// Copyright (c) 2005-2017 Jay Berkenbilt
+//
+// This file is part of qpdf.
+//
+// Licensed 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.
+//
+// Versions of qpdf prior to version 7 were released under the terms
+// of version 2.0 of the Artistic License. At your option, you may
+// continue to consider qpdf to be licensed under those terms. Please
+// see the manual for additional information.
 
 #ifndef __RANDOMDATAPROVIDER_HH__
 #define __RANDOMDATAPROVIDER_HH__
diff --git a/include/qpdf/Types.h b/include/qpdf/Types.h
index c7494220..f5beeb24 100644
--- a/include/qpdf/Types.h
+++ b/include/qpdf/Types.h
@@ -1,9 +1,23 @@
 /* Copyright (c) 2005-2017 Jay Berkenbilt
  *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
+ * This file is part of qpdf.
+ *
+ * Licensed 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.
+ *
+ * Versions of qpdf prior to version 7 were released under the terms
+ * of version 2.0 of the Artistic License. At your option, you may
+ * continue to consider qpdf to be licensed under those terms. Please
+ * see the manual for additional information.
  */
 
 #ifndef __QPDFTYPES_H__
diff --git a/include/qpdf/qpdf-c.h b/include/qpdf/qpdf-c.h
index 5510fb84..4d67a01d 100644
--- a/include/qpdf/qpdf-c.h
+++ b/include/qpdf/qpdf-c.h
@@ -1,9 +1,23 @@
 /* Copyright (c) 2005-2017 Jay Berkenbilt
  *
- * This file is part of qpdf.  This software may be distributed under
- * the terms of version 2 of the Artistic License which may be found
- * in the source distribution.  It is provided "as is" without express
- * or implied warranty.
+ * This file is part of qpdf.
+ *
+ * Licensed 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.
+ *
+ * Versions of qpdf prior to version 7 were released under the terms
+ * of version 2.0 of the Artistic License. At your option, you may
+ * continue to consider qpdf to be licensed under those terms. Please
+ * see the manual for additional information.
  */
 
 #ifndef __QPDF_C_H__