Move to MPLv2 license headers, with ESC decision and author's permission.

94 files changed, 305 insertions, 2158 deletions

diff --git a/connectivity/AllLangResTarget_cnr.mk b/connectivity/AllLangResTarget_cnr.mk
index 3a6327a69a03..df94ae27b13d 100644
--- a/connectivity/AllLangResTarget_cnr.mk
+++ b/connectivity/AllLangResTarget_cnr.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr))
 
diff --git a/connectivity/Jar_ConnectivityTools.mk b/connectivity/Jar_ConnectivityTools.mk
index 0f89c96629a7..ccc6c16746e2 100644
--- a/connectivity/Jar_ConnectivityTools.mk
+++ b/connectivity/Jar_ConnectivityTools.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Jar_Jar,ConnectivityTools))
 
diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index 711bcebf1271..7519bf1adc76 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Jar_Jar,sdbc_hsqldb))
 
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 08a95f572ffa..e496711f9db2 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,ado))
 
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 3f5ce099b668..6056e260f3ea 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,calc))
 
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 35c7f797d4f3..62c563296f96 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,dbase))
 
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index fbccc3ae0737..5aa8b8caa04d 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,dbpool2))
 
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 7a5df86d4574..62c5eaddc4f4 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,dbtools))
 
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index fe6ee4703d7c..3add37a7fa5c 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,evoab))
 
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index 6ced91c1e72f..ffdf14125475 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,file))
 
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 153db8f9b299..ecea162504fe 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,flat))
 
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index dd1472f507c8..6af6826035a1 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,jdbc))
 
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index e51ab45c018b..fae9ff3aea4d 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,kab1))
 
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index 022eaee25342..17108765efff 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,kabdrv1))
 
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index 7126f3b52ecf..178edd1e3131 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,macab1))
 
diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk
index 428daa1ddbcc..46295728f79a 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,macabdrv1))
 
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index e5f9fd11bb50..1d9d6b8d7acc 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,mysql))
 
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 3f7ccbf02301..82d447c4fc8b 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,odbc))
 
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index fc8f11ba4406..9819cfa6e7bd 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,odbcbase))
 
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index c79c2ad1431c..e8da4622492e 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,sdbc2))
 
diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 59f2f80cf039..298ed4c2c285 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,tdeab1))
 
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index b8786fdba677..bdfe273ec98e 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,tdeabdrv1))
 
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 61b317078f3c..df23c156ba9a 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Module_Module,connectivity))
 
diff --git a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
index 75328efa9aa2..51f8148d3d41 100644
--- a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -26,30 +26,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************ -->
 <oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
index 79c33c493c24..19f4dbf066ed 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * This file is part of the LibreOffice project.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
- *   (initial developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
 -->
 
 <component loader="com.sun.star.loader.SharedLibrary" prefix="postgresql_sdbc_impl"
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
index 28d468b3ea82..605bf0516982 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * This file is part of the LibreOffice project.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
- *   (initial developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
 -->
 
 <component loader="com.sun.star.loader.SharedLibrary" prefix="postgresql_sdbc"
diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index 743a83896b36..b4bdc6f14306 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -26,30 +26,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx
index dd485a5ffe86..ca0d0ae50861 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx
index 21589021e41d..ec0f8bfd6117 100644
--- a/connectivity/source/drivers/postgresql/pq_array.hxx
+++ b/connectivity/source/drivers/postgresql/pq_array.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index c64f459b6ca6..1abe9de8f748 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
index 6e6b27fdf432..5f9eac0679b2 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 4f830a1459ea..7eb43714299c 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -28,31 +28,11 @@
  *
  *  All parts contributed on or after August 2011:
  *
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
  *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
- *
  ************************************************************************/
 
 #include <list>
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 50b5407691a1..8b8a5cd1636f 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -28,31 +28,11 @@
  *
  *  All parts contributed on or after August 2011:
  *
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
  *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
- *
  ************************************************************************/
 
 #ifndef _PQ_CONNECTION_HXX_
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 71dd2f3c511d..c2839be7d3d8 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -28,31 +28,11 @@
  *
  *  All parts contributed on or after August 2011:
  *
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
  *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
- *
  *   Some portions were adapted from JDBC PostgreSQL driver:
  *
  *    Copyright (c) 2004-2008, PostgreSQL Global Development Group
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
index 9c226272bfde..23026bcc956f 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
@@ -28,31 +28,11 @@
  *
  *  All parts contributed on or after August 2011:
  *
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
  *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
- *
  ************************************************************************/
 
 #ifndef _PQ_DATABASEMETADATA_HXX_
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index ea5f62ceb244..f79c33edaed4 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx
index 7129fdeda49d..2574c7bdfeff 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.hxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index bb01e453588a..bc6a2271c34e 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
index 162c83e1f809..096cb2e0b0b8 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 538fa64136b1..e6dec909f250 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
index 58aefe759c5a..dc89342fc59e 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx
index 40c729f16ed5..8961b5a33f8a 100644
--- a/connectivity/source/drivers/postgresql/pq_resultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx
index 50ecf96cc2eb..7e566ae5efbe 100644
--- a/connectivity/source/drivers/postgresql/pq_resultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 96f7d373bf48..8a8845f07dea 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index aaf10c40efea..2d2687d1dcc4 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
index 5623c72d0d48..8fc73c46501c 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
index 0bb5e141d584..7a34fc303e1b 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
index 16a034d2037f..132f204ef0b7 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
index f027196d2bb1..b1360e8a53f3 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index cfbbd9fc7a6a..f8e25652eb97 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index 1f6d229f3e70..b0bff364017a 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 20180abb707f..1519b9cb5c2f 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index ca8103e4c23a..b812fb4a6901 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 478fb63d4f2d..f4125a1f09c2 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 13a3b11a7244..866ca085e8bf 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 855ae54c00f6..e0a363d34c45 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
index 6e2ab362e9a2..69b28353753c 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index b4d5ee3b167d..8cf9b03a7cf2 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx
index b46959cc507a..4af025481a51 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
index 3a46800fb73c..ce1e75bd4cce 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
index 213759cdf2b5..146dabf7af96 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index d5d253f8a6e1..c1f2d4e14cc6 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
index 4549d7163838..a714ba4bda8a 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 34150fae7706..d4844a687e2e 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
index 07730d861ff1..12d7c7c651c3 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 6addb264b038..698d75b69aa8 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx
index a7a29abed1ba..ecfd95443960 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
index ea9c196a853a..69536a19581d 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
index 95ed9c6bc2a0..6e2e2a7ea905 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index 2dc1e49da23e..729f9e17b212 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
index b9bd6ca3e704..352bbd4d4141 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index 0ea2884bd477..5366230e46b0 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.hxx b/connectivity/source/drivers/postgresql/pq_xindexes.hxx
index b214ea6742ab..bd48abf8ac6a 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index 12d5b6ba06d2..04a4cc5493cc 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx
index cd8b611e3f63..9582f9afed56 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
index 8d48711d0f50..c795d6518d8c 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
index 789f83d9cbb3..3f9342e5bac1 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
index 21c70199000d..4e062df79cc0 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
index 9d5dd6af46ef..27a0baddac66 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 49756206e882..02b2df87e730 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.hxx b/connectivity/source/drivers/postgresql/pq_xkeys.hxx
index f61692c045f6..527e504d1f95 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 3370f74c59e0..d92e71d4e396 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx
index c96440ec0387..63bb2bec9302 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 844ae3a5dbb0..48a1a0a6b0c5 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx
index 54cd3a78fe18..b06f0d1b7d68 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index 3eed58192137..06045922c3a8 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx
index 072d09262e7e..bf59762dfa49 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx
index 63153675d91e..5f96c2227f27 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.hxx b/connectivity/source/drivers/postgresql/pq_xusers.hxx
index 6da25fa530e0..accedcfd2b3b 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index 1f84f2b3efeb..208e18f5140b 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx
index 001180916f64..5d57ea72e23a 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx
index e375a8b8e342..249c71a0d8a4 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx
index 3400fa1fa4d0..8603d83a792c 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx
@@ -28,30 +28,9 @@
  *
  *  All parts contributed on or after August 2011:
  *
- *    Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
- *
- *    The contents of this file are subject to the Mozilla Public License Version
- *    1.1 (the "License"); you may not use this file except in compliance with
- *    the License or as specified alternatively below. You may obtain a copy of
- *    the License at http://www.mozilla.org/MPL/
- *
- *    Software distributed under the License is distributed on an "AS IS" basis,
- *    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- *    for the specific language governing rights and limitations under the
- *    License.
- *
- *    Major Contributor(s):
- *    [ Copyright (C) 2011 Lionel Elie Mamane <lionel@mamane.lu> ]
- *
- *    All Rights Reserved.
- *
- *    For minor contributions see the git repository.
- *
- *    Alternatively, the contents of this file may be used under the terms of
- *    either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- *    the GNU Lesser General Public License Version 2.1 or later (the "LGPLv2.1+"),
- *    in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
- *    instead of those above.
+ *    This Source Code Form is subject to the terms of the Mozilla Public
+ *    License, v. 2.0. If a copy of the MPL was not distributed with this
+ *    file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  ************************************************************************/
 
diff --git a/connectivity/source/inc/parse/sqlbison_exports.hxx b/connectivity/source/inc/parse/sqlbison_exports.hxx
index c83befeaac19..38fa786402ea 100644
--- a/connectivity/source/inc/parse/sqlbison_exports.hxx
+++ b/connectivity/source/inc/parse/sqlbison_exports.hxx
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Copyright 2012 LibreOffice contributors.
+ * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this