diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 191ab498eb4..60abac21cd9 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -328,19 +328,22 @@ HideCFiles.description= Hides all C files
 HideHeaderFiles.label= Header files
 HideHeaderFiles.description= Hides all Header files
 
-HideUsingDirective.label= Using directive
-HideUsingDirective.description= Hides using directives
-
-HideMacroDirective.label= Macro directive
-HideMacroDirective.description= Hides Macro directives
-
 HideAnonymousStruct.label= Anonymous structs and enums
 HideAnonymousStruct.navigator.label= C/C++ anonymous structs and enums
 HideAnonymousStruct.description= Hides all anonymous structs and enums
 
 ForwardDeclarationFilter.label= Forward declaration
+ForwardDeclarationFilter.navigator.label= C/C++ forward declaration
 ForwardDeclarationFilter.description= Hides forward declarations, unless found in a header file.
 
+HideMacroDirective.label= Macro directive
+HideMacroDirective.navigator.label= C/C++ macro directive
+HideMacroDirective.description= Hides Macro directives
+
+HideUsingDirective.label= Using directive
+HideUsingDirective.navigator.label= C/C++ using directive
+HideUsingDirective.description= Hides using directives
+
 #
 WorkInProgress.name=Work In Progress
 
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 5862843fc1a..66b12967dc3 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -143,22 +143,38 @@
             class="org.eclipse.cdt.internal.ui.filters.AnonymousStructFilter"
             id="org.eclipse.cdt.internal.ui.CView.AnonymousStructFilter">
       </filter>
-<!-- C/C++ Outline Page -->
       <filter
-            targetId="org.eclipse.cdt.ui.COutlinePage"
-            name="%HideUsingDirective.label"
-            enabled="false"
-            description="%HideUsingDirective.description"
-            class="org.eclipse.cdt.internal.ui.filters.UsingDirectiveFilter"
-            id="org.eclipse.cdt.ui.COutlinePage.UsingDeclarationFilter">
+            targetId="org.eclipse.cdt.ui.CView"
+            name="%ForwardDeclarationFilter.label"
+            enabled="true"
+            description="%ForwardDeclarationFilter.description" 
+            class="org.eclipse.cdt.internal.ui.filters.ForwardDeclarationFilter"
+            id="org.eclipse.cdt.internal.ui.CView.ForwardDeclarationFilter">
       </filter>
       <filter
-            targetId="org.eclipse.cdt.ui.COutlinePage"
+            targetId="org.eclipse.cdt.ui.CView"
             name="%HideMacroDirective.label"
             enabled="false"
             description="%HideMacroDirective.description"
             class="org.eclipse.cdt.internal.ui.filters.MacroDirectiveFilter"
-            id="org.eclipse.cdt.ui.COutlinePage.MacroDirectiveFilter">
+            id="org.eclipse.cdt.internal.ui.CView.MacroDirectiveFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.cdt.ui.CView"
+            name="%HideUsingDirective.label"
+            enabled="false"
+            description="%HideUsingDirective.description"
+            class="org.eclipse.cdt.internal.ui.filters.UsingDirectiveFilter"
+            id="org.eclipse.cdt.internal.ui.CView.UsingDeclarationFilter">
+      </filter>
+<!-- C/C++ Outline Page -->
+      <filter
+            targetId="org.eclipse.cdt.ui.COutlinePage"
+            name="%HideAnonymousStruct.label"
+            enabled="false"
+            description="%HideAnonymousStruct.description"
+            class="org.eclipse.cdt.internal.ui.filters.AnonymousStructFilter"
+            id="org.eclipse.cdt.ui.COutlinePage.AnonymousStructFilter">
       </filter>
       <filter
             targetId="org.eclipse.cdt.ui.COutlinePage"
@@ -170,11 +186,19 @@
       </filter>
       <filter
             targetId="org.eclipse.cdt.ui.COutlinePage"
-            name="%HideAnonymousStruct.label"
+            name="%HideMacroDirective.label"
             enabled="false"
-            description="%HideAnonymousStruct.description"
-            class="org.eclipse.cdt.internal.ui.filters.AnonymousStructFilter"
-            id="org.eclipse.cdt.ui.COutlinePage.AnonymousStructFilter">
+            description="%HideMacroDirective.description"
+            class="org.eclipse.cdt.internal.ui.filters.MacroDirectiveFilter"
+            id="org.eclipse.cdt.ui.COutlinePage.MacroDirectiveFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.cdt.ui.COutlinePage"
+            name="%HideUsingDirective.label"
+            enabled="false"
+            description="%HideUsingDirective.description"
+            class="org.eclipse.cdt.internal.ui.filters.UsingDirectiveFilter"
+            id="org.eclipse.cdt.ui.COutlinePage.UsingDeclarationFilter">
       </filter>
 <!-- Asm Outline Page -->
       <filter
@@ -3827,6 +3851,22 @@
           description="%HideAnonymousStruct.description"
           id="org.eclipse.cdt.ui.navigator.filters.AnonymousStructFilter"
           name="%HideAnonymousStruct.navigator.label"/>
+    <commonFilter
+          activeByDefault="true"
+          class="org.eclipse.cdt.internal.ui.filters.ForwardDeclarationFilter"
+          description="%ForwardDeclarationFilter.description"
+          id="org.eclipse.cdt.ui.navigator.filters.ForwardDeclarationFilter"
+          name="%ForwardDeclarationFilter.navigator.label"/>
+    <commonFilter
+          class="org.eclipse.cdt.internal.ui.filters.MacroDirectiveFilter"
+          description="%HideMacroDirective.description"
+          id="org.eclipse.cdt.ui.navigator.filters.MacroDirectiveFilter"
+          name="%HideMacroDirective.navigator.label"/>
+    <commonFilter
+          class="org.eclipse.cdt.internal.ui.filters.UsingDirectiveFilter"
+          description="%HideUsingDirective.description"
+          id="org.eclipse.cdt.ui.navigator.filters.UsingDirectiveFilter"
+          name="%HideUsingDirective.navigator.label"/>
   </extension>
   <extension
          point="org.eclipse.ui.navigator.linkHelper">