diff --git a/CMake/otbIncludeDirectories.cmake b/CMake/otbIncludeDirectories.cmake
index 851884f8fc25da627b70f08ba1735eefbd25856b..54cf7d4ca8a7cf52041b355821a323aa0adf7139 100644
--- a/CMake/otbIncludeDirectories.cmake
+++ b/CMake/otbIncludeDirectories.cmake
@@ -57,6 +57,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
   ${OTB_SOURCE_DIR}/Code/Visu
   ${OTB_SOURCE_DIR}/Code/Visualization
   ${OTB_BINARY_DIR}/Code/Visualization
+  ${OTB_SOURCE_DIR}/Code/ApplicationEngine
   ${OTB_MSINTTYPES_INCLUDE_DIR_BUILDTREE}
   ${OTB_SOURCE_DIR}/Utilities/otbsvm
   ${OTB_SOURCE_DIR}/Utilities/otbossimplugins
@@ -311,6 +312,7 @@ SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
   OBIA
   Fuzzy
   ObjectDetection
+  ApplicationEngine
   Utilities
   Utilities/ITK
   ${OTB_MSINTTYPES_INCLUDE_RELATIVE_DIR}
diff --git a/Code/ApplicationEngine/CMakeLists.txt b/Code/ApplicationEngine/CMakeLists.txt
index 740dffdeab8f34832e826c17b1cc2b7038e6df9a..6b6e569dde0e4c1a98327051dc61aa5788eb7a2d 100644
--- a/Code/ApplicationEngine/CMakeLists.txt
+++ b/Code/ApplicationEngine/CMakeLists.txt
@@ -2,7 +2,7 @@ file(GLOB srcs "*.cxx")
 
 add_library(OTBWrapperCore ${srcs}  ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/Code/Common)
-target_link_libraries(OTBWrapperCore OTBWrapperCommon OTBCommon OTBIO)
+target_link_libraries(OTBWrapperCore OTBCommon OTBIO)
 install(TARGETS OTBWrapperCore
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
index 79eef622d12e155050d16ad11ca5b1c82008748b..c25ca2df5bb66e2e20a4de4f97cf2ef90f79b4ae 100644
--- a/Code/CMakeLists.txt
+++ b/Code/CMakeLists.txt
@@ -31,6 +31,9 @@ IF(OTB_USE_PQXX)
         ADD_SUBDIRECTORY(GeospatialAnalysis)
 ENDIF(OTB_USE_PQXX)
 
+ADD_SUBDIRECTORY(ApplicationEngine)
+ADD_SUBDIRECTORY(Wrappers)
+
 IF(OTB_COMPILE_WITH_FULL_WARNING)
   IF(CMAKE_COMPILER_IS_GNUCXX)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OTB_FULL_WARNING_LIST_PARAMETERS}")
diff --git a/Code/Wrappers/CMakeLists.txt b/Code/Wrappers/CMakeLists.txt
index 15c4249bb79a708d843d18b98a9d3dc9d547541e..87fe0aba02f1896b64e8cdaed6f8b543edc7b822 100644
--- a/Code/Wrappers/CMakeLists.txt
+++ b/Code/Wrappers/CMakeLists.txt
@@ -22,4 +22,4 @@ if ( WRAP_PYQT )
   add_subdirectory(PyQt)
 endif()
 
- add_subdirectory(CommandLine)
\ No newline at end of file
+add_subdirectory(CommandLine)
\ No newline at end of file
diff --git a/Testing/Code/CMakeLists.txt b/Testing/Code/CMakeLists.txt
index d3850fdf96ac7d30ae60bf9dab0aa71fc6138931..427697234e1d6bb59bf3cb7075c0c21a6bce7fc7 100644
--- a/Testing/Code/CMakeLists.txt
+++ b/Testing/Code/CMakeLists.txt
@@ -1,5 +1,6 @@
 # $Id$
 
+ADD_SUBDIRECTORY(ApplicationEngine)
 ADD_SUBDIRECTORY(Common)
 ADD_SUBDIRECTORY(IO)
 ADD_SUBDIRECTORY(BasicFilters)
@@ -32,3 +33,4 @@ IF(OTB_USE_PQXX)
         ADD_SUBDIRECTORY(GeospatialAnalysis)
 ENDIF(OTB_USE_PQXX)
 
+ADD_SUBDIRECTORY(Wrappers)