diff --git a/codan/org.eclipse.cdt.codan-feature/feature.xml b/codan/org.eclipse.cdt.codan-feature/feature.xml
index f8d2f01fff6..d425ed4c9c3 100644
--- a/codan/org.eclipse.cdt.codan-feature/feature.xml
+++ b/codan/org.eclipse.cdt.codan-feature/feature.xml
@@ -35,7 +35,35 @@
       <import plugin="org.eclipse.cdt.ui" version="5.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="greaterOrEqual"/>
    </requires>
+   
+   <plugin
+         id="org.eclipse.cdt.codan.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
+   <plugin
+         id="org.eclipse.cdt.codan.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+   
+   <plugin
+         id="org.eclipse.cdt.codan.core.cxx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.codan.ui.cxx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
    <plugin
          id="org.eclipse.cdt.codan.checkers"
          download-size="0"
@@ -50,32 +78,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.cdt.codan.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.codan.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.codan.core.cxx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.codan.ui.cxx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 49afa04d241..cf1c3a7b915 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -156,12 +156,12 @@ plugin@org.eclipse.cdt.managedbuilder.bupc.ui=@cdtTag@,/cvsroot/tools,,org.eclip
 feature@org.eclipse.cdt.bupc=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.bupc-feature
 
 ! Codan
-plugin@org.eclipse.cdt.codan.checkers=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers
-plugin@org.eclipse.cdt.codan.checkers.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui
 plugin@org.eclipse.cdt.codan.core=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.core
 plugin@org.eclipse.cdt.codan.core.test=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.core.test
 plugin@org.eclipse.cdt.codan.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.ui
 plugin@org.eclipse.cdt.codan.core.cxx=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.core.cxx
 plugin@org.eclipse.cdt.codan.ui.cxx=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.ui.cxx
+plugin@org.eclipse.cdt.codan.checkers=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers
+plugin@org.eclipse.cdt.codan.checkers.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui
 plugin@org.eclipse.cdt.codan.examples=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.examples
 feature@org.eclipse.cdt.codan.feature=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan-feature