diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index a882f352e2411a978d8af6d62a6d1fd457aae7b0..931f54decbdff5f4e85d170c22666f2b47011f3e 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -1,3 +1,4 @@
+include(OTBWrapperMacros)
 
 add_subdirectory(Classification)
 add_subdirectory(Hyperspectral)
diff --git a/Applications/Classification/CMakeLists.txt b/Applications/Classification/CMakeLists.txt
index a07b502344cce9f4fe37f67d33f1b67dc69c8843..f846c17bf961ea535f13c4da40c4321b7c287da7 100644
--- a/Applications/Classification/CMakeLists.txt
+++ b/Applications/Classification/CMakeLists.txt
@@ -1,4 +1,3 @@
-include(WrapperMacros)
 
 OTB_CREATE_APPLICATION(NAME           EstimateImagesStatistics
                        SOURCES        otbEstimateImagesStatistics.cxx
diff --git a/Applications/Hyperspectral/CMakeLists.txt b/Applications/Hyperspectral/CMakeLists.txt
index ca64f51a6c768624f6212eb9a6aab968500b7daf..5d19ce017bc908c45afa92d5040ebb5823330349 100644
--- a/Applications/Hyperspectral/CMakeLists.txt
+++ b/Applications/Hyperspectral/CMakeLists.txt
@@ -1,3 +1,2 @@
-include(WrapperMacros)
 
 OTB_CREATE_APPLICATION(NAME HyperspectralUnmixing SOURCES otbHyperspectralUnmixing.cxx LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Applications/Test/CMakeLists.txt b/Applications/Test/CMakeLists.txt
index dc718cb0c6accb9faa7a15312b848aa234315207..1e87f0567fb8263e199dc6e93aba95d534cc7c21 100644
--- a/Applications/Test/CMakeLists.txt
+++ b/Applications/Test/CMakeLists.txt
@@ -1,4 +1,3 @@
-include(WrapperMacros)
 
 OTB_CREATE_APPLICATION(NAME Addition        SOURCES otbAddition.cxx)
 OTB_CREATE_APPLICATION(NAME AllocateOutput  SOURCES otbAllocateOutput.cxx LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Applications/Util/CMakeLists.txt b/Applications/Util/CMakeLists.txt
index 98f37dc2f42c001b8e8918533eed1c9c5e41bcd9..2e6d588eb228df3824ffeaae8deb6b0436a49ff1 100644
--- a/Applications/Util/CMakeLists.txt
+++ b/Applications/Util/CMakeLists.txt
@@ -1,4 +1,3 @@
-include(WrapperMacros)
 
 OTB_CREATE_APPLICATION(NAME           ExtractROI
                        SOURCES        otbExtractROI.cxx
diff --git a/CMake/ParseArguments.cmake b/CMake/OTBParseArguments.cmake
similarity index 100%
rename from CMake/ParseArguments.cmake
rename to CMake/OTBParseArguments.cmake
diff --git a/CMake/WrapperMacros.cmake b/CMake/OTBWrapperMacros.cmake
similarity index 100%
rename from CMake/WrapperMacros.cmake
rename to CMake/OTBWrapperMacros.cmake