diff --git a/Code/Projections/otbGenericMapProjection.h b/Code/Projections/otbGenericMapProjection.h
index 362f5aa8b5ac61728135f7ba841a9ac99c2c7f25..930619686c9d5f7a8d965a64357078cdc49c1514 100644
--- a/Code/Projections/otbGenericMapProjection.h
+++ b/Code/Projections/otbGenericMapProjection.h
@@ -21,10 +21,12 @@
 #include <iostream>
 #include <sstream>
 #include <stdio.h>
-#include "projection/ossimProjection.h"
+
 #include "itkTransform.h"
 #include "itkExceptionObject.h"
 #include "itkMacro.h"
+
+#include "projection/ossimProjection.h"
 #include "base/ossimGpt.h"
 #include "base/ossimDpt.h"
 #include "projection/ossimProjection.h"
diff --git a/Code/Projections/otbGenericMapProjection.txx b/Code/Projections/otbGenericMapProjection.txx
index 60e32659b1fb132140c01739c84a32af1ea49b52..d5c8af6a3f146c08f9127bae1647a7496dfeb4d1 100644
--- a/Code/Projections/otbGenericMapProjection.txx
+++ b/Code/Projections/otbGenericMapProjection.txx
@@ -20,8 +20,16 @@
 
 #include "otbGenericMapProjection.h"
 #include "otbMacro.h"
+
 #include "projection/ossimMapProjectionFactory.h"
 #include "projection/ossimMapProjection.h"
+#include "base/ossimGpt.h"
+#include "base/ossimDpt.h"
+#include "projection/ossimProjection.h"
+#include "base/ossimEllipsoid.h"
+#include "base/ossimEllipsoidFactory.h"
+#include "base/ossimString.h"
+#include "gdal/ossimOgcWktTranslator.h"
 
 namespace otb
 {
diff --git a/Code/Projections/otbMapProjection.h b/Code/Projections/otbMapProjection.h
index 2c4d0ebda3887858e1d2fcc0f659cb7cc55b438d..edfc1413de751c951926770d9153499c6729c913 100644
--- a/Code/Projections/otbMapProjection.h
+++ b/Code/Projections/otbMapProjection.h
@@ -21,17 +21,10 @@
 #include <iostream>
 #include <sstream>
 #include <stdio.h>
-#include "projection/ossimMapProjection.h"
+
 #include "itkTransform.h"
 #include "itkExceptionObject.h"
 #include "itkMacro.h"
-#include "base/ossimGpt.h"
-#include "base/ossimDpt.h"
-#include "projection/ossimProjection.h"
-#include "base/ossimEllipsoid.h"
-#include "base/ossimEllipsoidFactory.h"
-#include "base/ossimString.h"
-#include "gdal/ossimOgcWktTranslator.h"
 #include "otbGenericMapProjection.h"
 
 namespace otb
diff --git a/Code/Projections/otbMapProjection.txx b/Code/Projections/otbMapProjection.txx
index a87f3ee47d8d6a2f9035cb5254c9e279cd43986d..9631fc644edf44d9ad14562cadcd453d87a18e16 100644
--- a/Code/Projections/otbMapProjection.txx
+++ b/Code/Projections/otbMapProjection.txx
@@ -21,6 +21,15 @@
 #include "otbMapProjection.h"
 #include "otbMacro.h"
 
+#include "projection/ossimMapProjection.h"
+#include "base/ossimGpt.h"
+#include "base/ossimDpt.h"
+#include "projection/ossimProjection.h"
+#include "base/ossimEllipsoid.h"
+#include "base/ossimEllipsoidFactory.h"
+#include "base/ossimString.h"
+#include "gdal/ossimOgcWktTranslator.h"
+
 namespace otb
 {