diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf9c9af9d403ae0cce7c6741fd6af0701557952c..b688cca53ca5b6999c507273e6435f31b3ca58da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 # WARNING!
 # OTB uses Git-LFS to store the (large) tests data.
 # Git-LFS is mostly transparent for the user and recent versions
diff --git a/.travis.yml b/.travis.yml
index ec99d4dea9a1ee15fcf3db29a8e2d6244e39ab90..cfa41ecef3e3142d344515ca29dec71c4b39d4bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 language: cpp
 
 sudo: false
diff --git a/CI/deploy.sh b/CI/deploy.sh
index 65ec39a861cb1dfb5585ede00f89f04303e62274..87ebabc41a358195c81d637878c4deb2101012ad 100755
--- a/CI/deploy.sh
+++ b/CI/deploy.sh
@@ -1,4 +1,24 @@
 #!/bin/bash
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 # Configure git for tar.xz
 git config tar.tar.xz.command "xz -c"
 
diff --git a/CI/dev_env.bat b/CI/dev_env.bat
index 061c9ee0b528531399a17926e184cb48877b5026..c5091ba9163324016bf1e0d914e238e7457413b4 100644
--- a/CI/dev_env.bat
+++ b/CI/dev_env.bat
@@ -1,3 +1,22 @@
+::
+:: Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+::
+:: This file is part of Orfeo Toolbox
+::
+::     https://www.orfeo-toolbox.org/
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::     http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+
 @echo off
 :: check input arguments
 if %1.==. (
diff --git a/CI/headers_check.py b/CI/headers_check.py
index c5011639bf5f7c14c8b2ff7e449d98023d9dcd07..c61ef7d8335bded6c249c6d49a385b21e757e747 100755
--- a/CI/headers_check.py
+++ b/CI/headers_check.py
@@ -158,7 +158,7 @@ r'''/\*
 | \* Copyright \(C\) 20\d\d(-20\d\d)? Centre National d'Etudes Spatiales \(CNES\)
 | \* Copyright \(C\) 20\d\d(-20\d\d)? CS Systemes d'Information \(CS SI\)
 | \* Copyright \(C\) 2007-2012 Institut Mines Telecom / Telecom Bretagne
-| \* Copyright \(C\) 2005-2016 IRSTEA
+| \* Copyright \(C\) 20\d\d(-20\d\d)? IRSTEA
 | \* Copyright \(C\) 2008 Jan Wegner
 | \* Copyright \(C\) 2007 Julien Radoux
 )+ \*
diff --git a/CI/otb_coverage.sh b/CI/otb_coverage.sh
index 0b5d4b219fdb1584778edf7d8d321b5eca080e20..97af083aa6d571f9d1ad0e6be6f5494f9e2d61ee 100755
--- a/CI/otb_coverage.sh
+++ b/CI/otb_coverage.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 # usage : call CI/otb_coverage.sh from source dir
 OTB_DIR="$(dirname $0)/.."
diff --git a/CI/test/cdash_test.py b/CI/test/cdash_test.py
index d64ce9f26c5975d2968edcf9170851fa5dcac447..b179954e6d1ba9889eb12ab9c83aefa8b1535681 100644
--- a/CI/test/cdash_test.py
+++ b/CI/test/cdash_test.py
@@ -1,3 +1,24 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 import unittest
 import os.path
 import sys
@@ -70,4 +91,4 @@ class TestHandler(unittest.TestCase):
 
 
 if __name__ == '__main__':
-  unittest.main()
\ No newline at end of file
+  unittest.main()
diff --git a/CMake/otbcli.bat.in b/CMake/otbcli.bat.in
index 3016c022e474338576c20cea114da8662d247045..d9dbaff9a2c40696c6a5e96335fe90ef08ae8ffc 100644
--- a/CMake/otbcli.bat.in
+++ b/CMake/otbcli.bat.in
@@ -1,3 +1,22 @@
+::
+:: Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+::
+:: This file is part of Orfeo Toolbox
+::
+::     https://www.orfeo-toolbox.org/
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::     http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+
 @echo off
 ::
 :: Autogenerated by OTB installation process
diff --git a/CMake/otbcli.sh.in b/CMake/otbcli.sh.in
index 65bec6865398591429712c71c636bed7b1abdeb6..c16bd6060121483eaa66088981727fb691f30bf3 100644
--- a/CMake/otbcli.sh.in
+++ b/CMake/otbcli.sh.in
@@ -1,4 +1,23 @@
 #!/bin/sh
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 #
 # Autogenerated by OTB installation process
diff --git a/CMake/otbgui.bat.in b/CMake/otbgui.bat.in
index a450ce7881e68eff1a4d718155d1c7e63149fe82..acaf9a41f450a2c1f1172149bab007416702b256 100644
--- a/CMake/otbgui.bat.in
+++ b/CMake/otbgui.bat.in
@@ -1,3 +1,22 @@
+::
+:: Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+::
+:: This file is part of Orfeo Toolbox
+::
+::     https://www.orfeo-toolbox.org/
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::     http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+
 @echo off
 ::
 :: Autogenerated by OTB installation process
diff --git a/CMake/otbgui.sh.in b/CMake/otbgui.sh.in
index 8633efad8cb9097ab3caf34b9c80a91a18f129d7..6e4d81ea176a5c9d43b3e25253cda87114f68ef6 100644
--- a/CMake/otbgui.sh.in
+++ b/CMake/otbgui.sh.in
@@ -1,4 +1,23 @@
 #!/bin/sh
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 #
 # Autogenerated by OTB installation process
diff --git a/Documentation/Cookbook/CMake/RunApplicationsRstGenerator.sh.cmake.in b/Documentation/Cookbook/CMake/RunApplicationsRstGenerator.sh.cmake.in
index cf902c1eb10149d74def84663547781abf0dbee4..18463d6cb437180088c2137eb04d6220aa7aeeed 100644
--- a/Documentation/Cookbook/CMake/RunApplicationsRstGenerator.sh.cmake.in
+++ b/Documentation/Cookbook/CMake/RunApplicationsRstGenerator.sh.cmake.in
@@ -1,4 +1,23 @@
 #!/bin/sh
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 #cmake builds with rpath in the binary dir, so we don't need to set LD_LIBRARY_PATH here
 #export LD_LIBRARY_PATH=@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH
diff --git a/Documentation/Cookbook/Scripts/migrate_sg_tex.py b/Documentation/Cookbook/Scripts/migrate_sg_tex.py
index a4faa2d1aca5836ac2fd5afea499e4f7eedce2dc..27d5a890c0929a6332e6f4ec23e17222661b4233 100644
--- a/Documentation/Cookbook/Scripts/migrate_sg_tex.py
+++ b/Documentation/Cookbook/Scripts/migrate_sg_tex.py
@@ -1,3 +1,24 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 import argparse
 import re
 import os
diff --git a/Documentation/Cookbook/Scripts/otb_warnings.py b/Documentation/Cookbook/Scripts/otb_warnings.py
index 1bace05986cf4cb357b89bd797697d1002695450..053a99f7525cc2ce91a7c476dd0325b78723285b 100644
--- a/Documentation/Cookbook/Scripts/otb_warnings.py
+++ b/Documentation/Cookbook/Scripts/otb_warnings.py
@@ -1,3 +1,24 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 import sys
 import re
 
diff --git a/Documentation/Cookbook/Scripts/rst_utils.py b/Documentation/Cookbook/Scripts/rst_utils.py
index 42cf7683d00ed9e9a0acbb07bb2031dc54268537..760819ae90a7814a0c100710b8328f7430122919 100644
--- a/Documentation/Cookbook/Scripts/rst_utils.py
+++ b/Documentation/Cookbook/Scripts/rst_utils.py
@@ -1,3 +1,23 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 # Regex used to find examples usage
 examples_usage_regex = r"\/\* Example usage:\n(\.\/\w+ (.*?))\*\/"
diff --git a/Documentation/Cookbook/_static/js/versions.js b/Documentation/Cookbook/_static/js/versions.js
index 69e4743c6364964f1f4a2f96a1ca49a60cbb7cb0..1144ae792742eee42c8ad2f3155d6fd0451758fc 100644
--- a/Documentation/Cookbook/_static/js/versions.js
+++ b/Documentation/Cookbook/_static/js/versions.js
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 // This piece of javascript is used to display the versions widget at the lower
 // left corner of the html CookBook for OTB
diff --git a/Modules/Applications/AppClassification/app/otbTrainRegression.cxx b/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
index b576735070fe35c01c0954bfa7de49d055a7f4a2..9456b93c23b3e94526b8792d2e6c08c5632ab397 100644
--- a/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
@@ -1,22 +1,22 @@
 /*
-  * Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
-  *
-  * This file is part of Orfeo Toolbox
-  *
-  *     https://www.orfeo-toolbox.org/
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
+ * Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "otbLearningApplicationBase.h"
 #include "otbWrapperApplicationFactory.h"
diff --git a/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx b/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx
index 881e8dd97a983495e438b43cdf59da376c2f112e..95ffd94c59416207a2d8287280d5dfff519f4952 100644
--- a/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx
+++ b/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017 National Research Institute of Science and
- * Technology for Environment and Agriculture (IRSTEA)
+ * Copyright (C) 2017 IRSTEA
  *
  * This file is part of Orfeo Toolbox
  *
diff --git a/Modules/Applications/AppSARUtils/CMakeLists.txt b/Modules/Applications/AppSARUtils/CMakeLists.txt
index bd7a065d1828ce742920e76cd6382c222f5f67cf..a6415e933eea99a347a8961b063236fc3aa7dcab 100644
--- a/Modules/Applications/AppSARUtils/CMakeLists.txt
+++ b/Modules/Applications/AppSARUtils/CMakeLists.txt
@@ -1,2 +1,22 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 project(OTBAppSARUtils)
 otb_module_impl()
diff --git a/Modules/Applications/AppSARUtils/otb-module.cmake b/Modules/Applications/AppSARUtils/otb-module.cmake
index 964acb5a4f4f01fcfc86bd030df4e067da8af680..145c7d6196846c08762fc5f5a32b39d1e3428dc6 100644
--- a/Modules/Applications/AppSARUtils/otb-module.cmake
+++ b/Modules/Applications/AppSARUtils/otb-module.cmake
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 set(DOCUMENTATION "SAR Utils application.")
 
 otb_module(OTBAppSARUtils
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h
index 47a453d10c814807facbc7233d001bf8e0d001d9..7e827ea9c525726640afa0d84ba843003b4ebcab 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h
@@ -1,20 +1,23 @@
-/*=========================================================================
-
-  Program:   ORFEO Toolbox
-  Language:  C++
-  Date:      $Date$
-  Version:   $Revision$
-
-
-  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-  See OTBCopyright.txt for details.
-
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
+/*
+ * Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-=========================================================================*/
 #ifndef otbBinaryFunctorImageFilter_h
 #define otbBinaryFunctorImageFilter_h
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h
index 1271eb825daf314a8d18294d15eff7b96c8af5ae..bfe45554551f0481c69e713e94b032500583cf76 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h
@@ -1,20 +1,23 @@
-/*=========================================================================
-
-  Program:   ORFEO Toolbox
-  Language:  C++
-  Date:      $Date$
-  Version:   $Revision$
-
-
-  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-  See OTBCopyright.txt for details.
-
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
+/*
+ * Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-=========================================================================*/
 #ifndef otbTernaryFunctorImageFilter_h
 #define otbTernaryFunctorImageFilter_h
 
diff --git a/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
index 583164e186fcdf0a8d8616831766877e69ef349f..dcdb532d06fca42a79e68beea7cbb9b2b982a846 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
- 
+ *
  * This file is part of Orfeo Toolbox
  *
  *     https://www.orfeo-toolbox.org/
diff --git a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
index e627b74af11694700be2216d2adf745179528d83..5d15b1832db1e84e7959d596be42f9a00cf31cc4 100644
--- a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) CS SI
+ * Copyright (C) 2017-2019 CS Systemes d'Information (CS SI)
  *
  * This file is part of Orfeo Toolbox
  *
diff --git a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
index 849eea28a6c957b3e53f75a1344de676beda0511..23d525eda8eb4e17f6e4e141b05fb3020a7493a0 100644
--- a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) CS SI
+ * Copyright (C) 2017-2019 CS Systemes d'Information (CS SI)
  *
  * This file is part of Orfeo Toolbox
  *
diff --git a/Modules/IO/ImageIO/src/otbMultiImageFileWriter.cxx b/Modules/IO/ImageIO/src/otbMultiImageFileWriter.cxx
index a3f32a8d36bd404a271c2fd58d61b94488faf981..327bf23fac5cb1140d57f2c7749cd5ef764aaf59 100644
--- a/Modules/IO/ImageIO/src/otbMultiImageFileWriter.cxx
+++ b/Modules/IO/ImageIO/src/otbMultiImageFileWriter.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) CS SI
+ * Copyright (C) 2017-2019 CS Systemes d'Information (CS SI)
  *
  * This file is part of Orfeo Toolbox
  *
diff --git a/Modules/IO/ImageIO/test/otbImageFileReaderOptBandTest.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderOptBandTest.cxx
index 5f308702b95f9df3c2cea8b3650c0ab85bdab715..c41c5b535e1633259916e08e3da4d3b895e7ae1c 100644
--- a/Modules/IO/ImageIO/test/otbImageFileReaderOptBandTest.cxx
+++ b/Modules/IO/ImageIO/test/otbImageFileReaderOptBandTest.cxx
@@ -1,20 +1,23 @@
-/*=========================================================================
+/*
+ * Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-  Program:   ORFEO Toolbox
-  Language:  C++
-  Date:      $Date$
-  Version:   $Revision$
-
-
-  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-  See OTBCopyright.txt for details.
-
-
-  This software is distributed WITHOUT ANY WARRANTY; without even
-  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the above copyright notices for more information.
-
-=========================================================================*/
 #include "otbImage.h"
 #include "itkMacro.h"
 #include <iostream>
diff --git a/Modules/IO/ImageIO/test/otbMultiImageFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbMultiImageFileWriterTest.cxx
index 77d6ede243b19c34694ff18a74959457c060a0d0..ac34570c933cd521f9a453bcbd2b71b2f3fcf7ff 100644
--- a/Modules/IO/ImageIO/test/otbMultiImageFileWriterTest.cxx
+++ b/Modules/IO/ImageIO/test/otbMultiImageFileWriterTest.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) CS SI
+ * Copyright (C) 2017-2019 CS Systemes d'Information (CS SI)
  *
  * This file is part of Orfeo Toolbox
  *
diff --git a/Modules/Remote/Mosaic.remote.cmake b/Modules/Remote/Mosaic.remote.cmake
index 87d0e5345e8c79fc2ba9347af0f42b3ef620367d..385a4288300926bb499406ce50244a4525f8029f 100644
--- a/Modules/Remote/Mosaic.remote.cmake
+++ b/Modules/Remote/Mosaic.remote.cmake
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 #Contact: Rémi Cresson <remi.cresson@teledetection.fr>
 otb_fetch_module(Mosaic
   "This module provides one application dedicated to images mosaicking
diff --git a/Modules/Remote/SertitObject.remote.cmake b/Modules/Remote/SertitObject.remote.cmake
index fa2d45eedf800175c44d19cedab5aaf1d575ab5d..5bb94f4a9bb078b5fa109085c6a9dd27efe3d59c 100644
--- a/Modules/Remote/SertitObject.remote.cmake
+++ b/Modules/Remote/SertitObject.remote.cmake
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 #Contact: arnaud.durand@sertit.u-strasbg.fr
 
 #SERTIT - University of Strasbourg http://sertit.u-strasbg.fr
diff --git a/Modules/Remote/diapotb.remote.cmake b/Modules/Remote/diapotb.remote.cmake
index cc771e7f1d620088b347badb112eb4572b23719d..71cc6f2d5c094e92a5e7ec0c5999c7d622cabd7a 100644
--- a/Modules/Remote/diapotb.remote.cmake
+++ b/Modules/Remote/diapotb.remote.cmake
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 #Contact: Gaëlle USSEGLIO
 otb_fetch_module(DiapOTBModule
   "OTB module for SAR processing in Diapason."
diff --git a/Modules/Remote/otbGRM.remote.cmake b/Modules/Remote/otbGRM.remote.cmake
index 3d2dda71f0cca6db264ff9b6cc6922719df4475e..5224df15d1fd21f8f75d459cc8f2bbedab8322e2 100644
--- a/Modules/Remote/otbGRM.remote.cmake
+++ b/Modules/Remote/otbGRM.remote.cmake
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 #Contact: Pierre Lassalle <lassallepierre34@gmail.com> 
 otb_fetch_module(otbGRM
   "This module provides the GRM OTB application to perform multiscale
diff --git a/Modules/Wrappers/SWIG/test/python/Bug1498.py b/Modules/Wrappers/SWIG/test/python/Bug1498.py
index ab0fb77e0d50756a412ea84dab5a3067d2822039..6e6ed15dc3b8ce82882d44f58a12ec0a9f028d36 100644
--- a/Modules/Wrappers/SWIG/test/python/Bug1498.py
+++ b/Modules/Wrappers/SWIG/test/python/Bug1498.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python3
+#-*- coding: utf-8 -*-
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 import otbApplication as otb
 
 # TO RUN WITH PYTHON3
diff --git a/Modules/Wrappers/SWIG/test/python/Bug1899.py b/Modules/Wrappers/SWIG/test/python/Bug1899.py
index 02cd8cd8332e5d33cd2f4a221cb82a672119b383..93d768d9ca8217372e56821c81a870ec1794ef78 100644
--- a/Modules/Wrappers/SWIG/test/python/Bug1899.py
+++ b/Modules/Wrappers/SWIG/test/python/Bug1899.py
@@ -1,5 +1,24 @@
 #!/usr/bin/env python3
 #-*- coding: utf-8 -*-
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 import sys
 import argparse
diff --git a/Modules/Wrappers/SWIG/test/python/PythonImageInterface.py b/Modules/Wrappers/SWIG/test/python/PythonImageInterface.py
index 62aade511e61aeaf5689fdaa00f8bda03afe4b9a..ee1bfc7243cba42ba148cd04585e18068456b325 100644
--- a/Modules/Wrappers/SWIG/test/python/PythonImageInterface.py
+++ b/Modules/Wrappers/SWIG/test/python/PythonImageInterface.py
@@ -1,3 +1,24 @@
+#!/usr/bin/env python3
+#-*- coding: utf-8 -*-
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 def test(otb, argv):
   # Create a smoothing application
diff --git a/Packaging/Files/mapla.bat b/Packaging/Files/mapla.bat
index 3d208a81c56347414c6da757d42444cda2dc68a9..d5e636761496423834f4eb718f72c3f18c9d845d 100644
--- a/Packaging/Files/mapla.bat
+++ b/Packaging/Files/mapla.bat
@@ -3,13 +3,13 @@
 ::
 :: This file is part of Orfeo Toolbox
 ::
-::   https://www.orfeo-toolbox.org/
+::     https://www.orfeo-toolbox.org/
 ::
 :: Licensed under the Apache License, Version 2.0 (the "License");
 :: you may not use this file except in compliance with the License.
 :: You may obtain a copy of the License at
 ::
-::   http://www.apache.org/licenses/LICENSE-2.0
+::     http://www.apache.org/licenses/LICENSE-2.0
 ::
 :: Unless required by applicable law or agreed to in writing, software
 :: distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/Packaging/Files/monteverdi.bat b/Packaging/Files/monteverdi.bat
index 59cc85f7299e0fa52a35e6aa2f7ed2eaf3fd6ed2..d8309fec7911444e5fc6203e697ae4c09633fb05 100644
--- a/Packaging/Files/monteverdi.bat
+++ b/Packaging/Files/monteverdi.bat
@@ -3,13 +3,13 @@
 ::
 :: This file is part of Orfeo Toolbox
 ::
-::    https://www.orfeo-toolbox.org/
+::     https://www.orfeo-toolbox.org/
 ::
 :: Licensed under the Apache License, Version 2.0 (the "License");
 :: you may not use this file except in compliance with the License.
 :: You may obtain a copy of the License at
 ::
-::    http://www.apache.org/licenses/LICENSE-2.0
+::     http://www.apache.org/licenses/LICENSE-2.0
 ::
 :: Unless required by applicable law or agreed to in writing, software
 :: distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/Packaging/Files/otbenv.bat b/Packaging/Files/otbenv.bat
index 6b4efefb227c0767592e1210f801f62212a7aded..d6f6412c5a15c776b5cbcdfa6096124a0fdbc943 100644
--- a/Packaging/Files/otbenv.bat
+++ b/Packaging/Files/otbenv.bat
@@ -3,19 +3,20 @@
 ::
 :: This file is part of Orfeo Toolbox
 ::
-::   https://www.orfeo-toolbox.org/
+::     https://www.orfeo-toolbox.org/
 ::
 :: Licensed under the Apache License, Version 2.0 (the "License");
 :: you may not use this file except in compliance with the License.
 :: You may obtain a copy of the License at
 ::
-::   http://www.apache.org/licenses/LICENSE-2.0
+::     http://www.apache.org/licenses/LICENSE-2.0
 ::
 :: Unless required by applicable law or agreed to in writing, software
 :: distributed under the License is distributed on an "AS IS" BASIS,
 :: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
+
 @echo off
 :: Setup environment for OTB package
 set CURRENT_SCRIPT_DIR=%~dp0
diff --git a/Packaging/Files/selftester.bat b/Packaging/Files/selftester.bat
index 85fe9d6d19e9804227e4c5295491d56afc2dc9e8..d30e8b350ac5576d12ae2bf150bfe9e6d7a440da 100755
--- a/Packaging/Files/selftester.bat
+++ b/Packaging/Files/selftester.bat
@@ -1,22 +1,24 @@
-@echo off
-::  Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
-:: 
-::  This file is part of Orfeo Toolbox
-:: 
-::      https://www.orfeo-toolbox.org/
-:: 
-::  Licensed under the Apache License, Version 2.0 (the "License");
-::  you may not use this file except in compliance with the License.
-::  You may obtain a copy of the License at
-:: 
-::      http://www.apache.org/licenses/LICENSE-2.0
-:: 
-::  Unless required by applicable law or agreed to in writing, software
-::  distributed under the License is distributed on an "AS IS" BASIS,
+::
+:: Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+::
+:: This file is part of Orfeo Toolbox
+::
+::     https://www.orfeo-toolbox.org/
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::     http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
 :: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
 
+@echo off
+
 rem set EXIT_ON_ERROR=0
 rem set TEST_VERBOSE=1
 rem cmd /k tools\selftester.bat /q > selftest_report.log 2>&1
diff --git a/Packaging/Files/uninstall_otb.bat b/Packaging/Files/uninstall_otb.bat
index 6ca7b67208f0e6c65e93bcf5aa1222902d784bee..9ef3871e0a1eb5fa9f343b688c6bf3cd789d4f42 100644
--- a/Packaging/Files/uninstall_otb.bat
+++ b/Packaging/Files/uninstall_otb.bat
@@ -1,16 +1,15 @@
-@echo off
-:: 
+::
 :: Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
 ::
 :: This file is part of Orfeo Toolbox
-:: 
-::    https://www.orfeo-toolbox.org/
+::
+::     https://www.orfeo-toolbox.org/
 ::
 :: Licensed under the Apache License, Version 2.0 (the "License");
 :: you may not use this file except in compliance with the License.
 :: You may obtain a copy of the License at
 ::
-::    http://www.apache.org/licenses/LICENSE-2.0
+::     http://www.apache.org/licenses/LICENSE-2.0
 ::
 :: Unless required by applicable law or agreed to in writing, software
 :: distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +17,8 @@
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
 
+@echo off
+
 :: script to uninstall OTB
 
 setlocal
diff --git a/Utilities/Doxygen/mcdoc.py b/Utilities/Doxygen/mcdoc.py
index 0242dcfbea1c0a6d15ea142891f96cec738c871c..071cf8a0397622d28ea67b02c8254b79ddc209e6 100644
--- a/Utilities/Doxygen/mcdoc.py
+++ b/Utilities/Doxygen/mcdoc.py
@@ -1,4 +1,23 @@
 #!/usr/bin/env python
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 import sys, os, re, glob
 try:
diff --git a/Utilities/Doxygen/otbgroup.pl b/Utilities/Doxygen/otbgroup.pl
index 89eabdf3869eed6426e804e7a72c4c91df624d5f..c8660c92f3b37275e222279d4b64cda1a5375270 100644
--- a/Utilities/Doxygen/otbgroup.pl
+++ b/Utilities/Doxygen/otbgroup.pl
@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 # if regular doxycomment add a @{
 # at next empty line add a //@}