diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java
index dd3bd1679e1..327fdfae56f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java
@@ -20,7 +20,6 @@ public interface IASTASMDeclaration extends IASTDeclaration {
 	/**
 	 * Get the assembly value.
 	 * 
-	 * @return
 	 */
 	public String getAssembly();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java
index 9867c4840bf..7b3b04d309b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java
@@ -30,7 +30,6 @@ public interface IASTCaseStatement extends IASTStatement {
 	/**
 	 * The expression that determines whether this case should be taken.
 	 * 
-	 * @return
 	 */
 	public IASTExpression getExpression();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCompositeTypeSpecifier.java
index 37c58da7311..c385846a0e0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCompositeTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCompositeTypeSpecifier.java
@@ -94,7 +94,6 @@ public interface IASTCompositeTypeSpecifier extends IASTDeclSpecifier , IASTName
 	/**
 	 * Get the scope that this interface eludes to in the logical tree.
 	 * 
-	 * @return
 	 */
 	public IScope getScope();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java
index b76bab68165..22281862ce9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java
@@ -111,8 +111,6 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
 
 	/**
 	 * Get the enum's name.
-	 * 
-	 * @return
 	 */
 	public IASTName getName();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
index 00e97309963..f23405ad4fa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
@@ -49,10 +49,9 @@ public interface IASTForStatement extends IASTStatement {
     public static final ASTNodeProperty INITIALIZER = new ASTNodeProperty(
             "IASTForStatement.INITIALIZER - initializer for IASTForStatement"); //$NON-NLS-1$
 
-    /**
-     * @return
-     */
+
     public IASTStatement getInitializerStatement();
+    
     /**
      * @param statement
      */
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDefinition.java
index ced12842e0d..c947000ac31 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDefinition.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDefinition.java
@@ -43,7 +43,6 @@ public interface IASTFunctionDefinition extends IASTDeclaration {
 	/**
 	 * Get the decl specifier for the function.
 	 * 
-	 * @return
 	 */
 	public IASTDeclSpecifier getDeclSpecifier();
 
@@ -57,7 +56,6 @@ public interface IASTFunctionDefinition extends IASTDeclaration {
 	/**
 	 * Get the declarator for the function.
 	 * 
-	 * @return
 	 */
 	public IASTFunctionDeclarator getDeclarator();
 
@@ -72,7 +70,6 @@ public interface IASTFunctionDefinition extends IASTDeclaration {
 	 * Get the body of the function. This is usually a compound statement but
 	 * C++ also has a function try block.
 	 * 
-	 * @return
 	 */
 	public IASTStatement getBody();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java
index e7e956e233b..3108144e81d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java
@@ -34,10 +34,9 @@ public interface IASTLabelStatement extends IASTStatement, IASTNameOwner {
 	 */
 	public void setName(IASTName name);
 
-    /**
-     * @return
-     */
+
     public IASTStatement getNestedStatement();
+    
     /**
      * @param s
      */
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
index d4d7270b5ee..15bd17cf24f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
@@ -20,7 +20,6 @@ public interface IASTMacroExpansion extends IASTNodeLocation {
 	/**
 	 * The macro definition used for the expansion
 	 * 
-	 * @return
 	 */
 	public IASTPreprocessorMacroDefinition getMacroDefinition();
 
@@ -48,7 +47,6 @@ public interface IASTMacroExpansion extends IASTNodeLocation {
 	 * The source locations for for the macro expansion. These are the locations
 	 * where the expansion in question occurred and was replaced.
 	 * 
-	 * @return
  	 * @deprecated use {@link IASTNodeLocation#asFileLocation()}.
 	 */
 	@Deprecated
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNameOwner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNameOwner.java
index bfa5d1cca06..2e0eff2166d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNameOwner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNameOwner.java
@@ -39,7 +39,7 @@ public interface IASTNameOwner {
 	/**
 	 * Get the role for the name. 
 	 * 
-	 * @param name <code>IASTName</code>
+	 * @param n <code>IASTName</code>
 	 * @return r_declaration, r_reference or r_unclear.
 	 */
 	public int getRoleForName( IASTName n );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorPragmaStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorPragmaStatement.java
index 917db6e1357..ae12b127e21 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorPragmaStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorPragmaStatement.java
@@ -21,7 +21,6 @@ public interface IASTPreprocessorPragmaStatement extends
 	
 	/**
 	 * Returns the pragma message.
-	 * @return
 	 */
 	public char[] getMessage();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java
index 7a4a8782471..3e91897a9b2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java
@@ -22,7 +22,6 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier {
 	 * refined by qualifiers for signed/unsigned and short/long. The type could
 	 * also be unspecified which usually means int.
 	 * 
-	 * @return
 	 */
 	public int getType();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java
index f2929181935..3f6fb9b453f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java
@@ -229,14 +229,10 @@ public interface IASTTranslationUnit extends IASTNode, IAdaptable {
 
 	/**
 	 * @param offset
-	 * @return
 	 */
 	public String getContainingFilename(int offset);
     
-    
-    /**
-     * @return
-     */
+
     public ParserLanguage getParserLanguage();
     
     /**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IArrayType.java
index c0ae9dd9dec..15902c2e8b6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IArrayType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IArrayType.java
@@ -20,14 +20,12 @@ package org.eclipse.cdt.core.dom.ast;
 public interface IArrayType extends IType {
     /**
      * get the type that this is an array of
-     * @return
      * @throws DOMException
      */
     IType getType() throws DOMException;
     
     /**
      * get the expression that represents the size of this array
-     * @return
      * @throws DOMException
      */
     IASTExpression getArraySizeExpression() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IBasicType.java
index 0c4dd9b094e..e6205e1eafb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IBasicType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IBasicType.java
@@ -24,7 +24,6 @@ public interface IBasicType extends IType {
 	 * then refined by qualifiers for signed/unsigned and short/long.
 	 * The type could also be unspecified which usually means int.
 	 * 
-	 * @return
 	 */
 	public int getType() throws DOMException;
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ICompositeType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ICompositeType.java
index 0914f135883..9ffe01de8bb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ICompositeType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ICompositeType.java
@@ -20,7 +20,6 @@ public interface ICompositeType extends IBinding, IType {
 	public static final int k_union = IASTCompositeTypeSpecifier.k_union;
 	/**
 	 *  what kind of composite type is this?
-	 * @return
 	 */
 	public int getKey() throws DOMException;
 	
@@ -36,13 +35,11 @@ public interface ICompositeType extends IBinding, IType {
 	 * or null if there is no such field.
 	 * 
 	 * @param name
-	 * @return
 	 */
 	public IField findField( String name ) throws DOMException;
 	
 	/**
 	 * get the IScope object that is associated with this composite type
-	 * @return
 	 * @throws DOMException
 	 */
 	public IScope getCompositeScope() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunction.java
index 61b8135bbf6..94fbb708099 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunction.java
@@ -30,14 +30,12 @@ public interface IFunction extends IBinding {
 	/**
 	 * Get the function scope
 	 * 
-	 * @return
 	 * @throws DOMException if this is a problem binding
 	 */
 	public IScope getFunctionScope() throws DOMException;
 	
 	/**
 	 * Get the IFunctionType for this function
-	 * @return
 	 * @throws DOMException if this is a problem binding
 	 */
 	public IFunctionType getType() throws DOMException;
@@ -45,7 +43,6 @@ public interface IFunction extends IBinding {
 	/**
 	 * Does this function have the static storage-class specifier
 	 * similarily for extern, auto, register
-	 * @return
 	 * @throws DOMException
 	 */
 	public boolean isStatic() throws DOMException;
@@ -55,14 +52,12 @@ public interface IFunction extends IBinding {
 
 	/**
 	 * is this function inline
-	 * @return
 	 * @throws DOMException
 	 */
 	public boolean isInline() throws DOMException;
 	
 	/**
 	 * Whether or not this function takes variable arguments
-	 * @return
 	 * @throws DOMException
 	 */
 	public boolean takesVarArgs()throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunctionType.java
index 30089c078f5..c30cd77ff28 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunctionType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IFunctionType.java
@@ -18,9 +18,9 @@ package org.eclipse.cdt.core.dom.ast;
  * @author aniefer
  */
 public interface IFunctionType extends IType {
+	
     /**
      * get the return type of this function type
-     * @return
      * @throws DOMException
      */
     public IType getReturnType() throws DOMException;
@@ -28,7 +28,6 @@ public interface IFunctionType extends IType {
     /**
      * get the adjusted parameter types
      * ISO C99 6.7.5.3, ISO C++98 8.3.4-3 
-     * @return
      * @throws DOMException
      */
     public IType [] getParameterTypes() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ILabel.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ILabel.java
index 291f9aa596c..764ab883f05 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ILabel.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ILabel.java
@@ -21,7 +21,6 @@ public interface ILabel extends IBinding {
 	/**
 	 * Returns the label statement for this label.
 	 * 
-	 * @return
 	 */
 	public IASTLabelStatement getLabelStatement() throws DOMException;
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IPointerType.java
index 904d9998e60..8d6936466a0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IPointerType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IPointerType.java
@@ -20,21 +20,18 @@ package org.eclipse.cdt.core.dom.ast;
 public interface IPointerType extends IType {
     /**
      * get the type that this is a pointer to
-     * @return
      * @throws DOMException
      */
     public IType getType() throws DOMException;
     
     /**
      * is this a const pointer
-     * @return
      * @throws DOMException
      */
     public boolean isConst() throws DOMException;
     
     /** 
      * is this a volatile pointer
-     * @return
      * @throws DOMException
      */
     public boolean isVolatile() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java
index 2c6a774b92b..92bc509b475 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemBinding.java
@@ -36,19 +36,16 @@ public interface IProblemBinding extends IBinding, IScope, IType {
     
     /**
      * get the AST node that this problem was created for
-     * @return
      */
     public IASTNode getASTNode();
 	
 	/**
 	 * returns the file name this problem occured in if known.
-	 * @return
 	 */
 	public String getFileName();
 	
 	/**
 	 * returns the line number for this problem if known
-	 * @return
 	 */
 	public int getLineNumber();
 	
@@ -60,35 +57,30 @@ public interface IProblemBinding extends IBinding, IScope, IType {
     /**
      * Attempt to use a symbol that was not found. 
      * Require attributes: A_SYMBOL_NAME
-     * @see #A_SYMBOL_NAME  
      */ 
     public final static int SEMANTIC_NAME_NOT_FOUND = 0x001;
 
     /**
      * Invalid overload of a particular name.
      * Required attributes: A_SYMBOL_NAME
-     * @see #A_SYMBOL_NAME  
      */
     public static final int SEMANTIC_INVALID_OVERLOAD = 0x002;
 
     /**
      * Invalid using directive.  
      * Required attributes: A_NAMESPACE_NAME
-     * @see #A_NAMESPACE_NAME
      */
     public static final int SEMANTIC_INVALID_USING = 0x003;
     
     /**
      * Ambiguous lookup for given name. 
      * Required attributes: A_SYMBOL_NAME
-     * @see #A_SYMBOL_NAME
      */
     public static final int SEMANTIC_AMBIGUOUS_LOOKUP = 0x004;
 
     /**
      * Invalid type provided
      * Required attribugtes: A_TYPE_NAME
-     * @see #A_TYPE_NAME
      */
     public static final int SEMANTIC_INVALID_TYPE = 0x005;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IQualifierType.java
index b2257ec5bfb..1155de16dfa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IQualifierType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IQualifierType.java
@@ -20,21 +20,18 @@ package org.eclipse.cdt.core.dom.ast;
 public interface IQualifierType extends IType {
     /**
      * is this a const type
-     * @return
      * @throws DOMException
      */
     public boolean isConst() throws DOMException;
     
     /** 
      * is this a volatile type
-     * @return
      * @throws DOMException
      */
     public boolean isVolatile() throws DOMException;
     
     /** 
      * get the type that this is qualifying
-     * @return
      * @throws DOMException
      */
     public IType getType() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IType.java
index 7c362cd7474..a743ce9828a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IType.java
@@ -20,7 +20,6 @@ public interface IType extends Cloneable {
     /**
      * is the given type the same as this type?
      * @param type
-     * @return
      */
     public boolean isSameType( IType type );
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ITypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ITypedef.java
index 8bfc39cbc18..4d0770785df 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ITypedef.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ITypedef.java
@@ -17,8 +17,6 @@ public interface ITypedef extends IBinding, IType {
 
 	/**
 	 * Returns the type that this thing is a typedef of
-	 * 
-	 * @return
 	 */
 	public IType getType() throws DOMException;
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IVariable.java
index bc8370dc336..a7e4ce669f8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IVariable.java
@@ -24,7 +24,6 @@ public interface IVariable extends IBinding {
 	/**
 	 * Does this function have the static storage-class specifier
 	 * similarily for extern, auto, register
-	 * @return
 	 * @throws DOMException
 	 */
 	public boolean isStatic() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICCompositeTypeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICCompositeTypeScope.java
index 5d5a4ef8f58..fb2f8bd1edc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICCompositeTypeScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICCompositeTypeScope.java
@@ -28,7 +28,6 @@ public interface ICCompositeTypeScope extends ICScope {
 	 * and that matches the given name.
 	 * 
 	 * @param name
-	 * @return
 	 * @throws DOMException
 	 */
 	public IBinding getBinding(char[] name) throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICFunctionScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICFunctionScope.java
index ede40251adb..11c031e0e2e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICFunctionScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICFunctionScope.java
@@ -27,7 +27,6 @@ public interface ICFunctionScope extends ICScope {
 	 * Get the scope representing the function body . returns null if there is
 	 * no function definition
 	 * 
-	 * @return
 	 * @throws DOMException
 	 */
 	public IScope getBodyScope() throws DOMException;
@@ -36,7 +35,6 @@ public interface ICFunctionScope extends ICScope {
 	 * return the ILabel binding in this scope that matches the given name
 	 * 
 	 * @param name
-	 * @return
 	 * @throws DOMException
 	 */
 	public IBinding getBinding(char[] name) throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java
index d9bff0625c3..6b10817ddcd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java
@@ -24,7 +24,6 @@ public interface ICPointerType extends IPointerType {
 	/**
 	 * is this a restrict pointer
 	 * 
-	 * @return
 	 */
 	boolean isRestrict();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICQualifierType.java
index d8bcf92b251..f13caa68b42 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICQualifierType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICQualifierType.java
@@ -23,7 +23,6 @@ public interface ICQualifierType extends IQualifierType {
 	/**
 	 * is this a restrict type
 	 * 
-	 * @return
 	 */
 	public boolean isRestrict();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java
index 9acccaaae1c..33a4a952e95 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java
@@ -28,7 +28,6 @@ public interface ICPPASTConversionName extends IASTName {
 	 * 
 	 * i.e. getTypeId() on operator int(); would return the IASTTypeId for "int" 
 	 * 
-	 * @return
 	 */
 	public IASTTypeId getTypeId();
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java
index c40ad53d114..10dfd55988f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java
@@ -23,7 +23,6 @@ public interface ICPPASTFieldReference extends IASTFieldReference {
 	/**
 	 * Was template keyword used?
 	 * 
-	 * @return
 	 */
 	public boolean isTemplate();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java
index 47f4b6d9b04..0c43c54f65d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java
@@ -45,7 +45,6 @@ public interface ICPPASTQualifiedName extends IASTName, IASTNameOwner {
 	/**
 	 * The last name is often semantically significant.
 	 * 
-	 * @return
 	 */
 	public IASTName getLastName();
 	
@@ -68,7 +67,6 @@ public interface ICPPASTQualifiedName extends IASTName, IASTNameOwner {
 	 * This is used to check if the ICPPASTQualifiedName's last segment is
 	 * an ICPPASTConversionName or an ICPPASTOperatorName.
 	 * 
-	 * @return
 	 */
 	public boolean isConversionOrOperator();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBase.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBase.java
index 13a5829a15b..d0b759ca9ae 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBase.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBase.java
@@ -28,7 +28,6 @@ public interface ICPPBase {
 	 * In the case of typedefs, the binding being typedefed will be returned instead of
 	 * the typedef itself.
 	 * 
-	 * @return
 	 */
 	public IBinding getBaseClass() throws DOMException;
 	
@@ -41,7 +40,6 @@ public interface ICPPBase {
 	/**
 	 * The visibility qualifier applied to the base class.
 	 * 
-	 * @return
 	 */
 	public int getVisibility() throws DOMException;
 
@@ -54,7 +52,6 @@ public interface ICPPBase {
 	/**
 	 * Whether this is a virtual base class.
 	 * 
-	 * @return
 	 */
 	public boolean isVirtual() throws DOMException;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBinding.java
index 41074f04809..e1dcb913446 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPBinding.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.core.dom.ast.IBinding;
 public interface ICPPBinding extends IBinding {
 	/**
 	 * return an array of strings representing the qualified name of this binding
-	 * @return
 	 */
 	public String [] getQualifiedName() throws DOMException;
 	public char [][] getQualifiedNameCharArray() throws DOMException;
@@ -32,7 +31,6 @@ public interface ICPPBinding extends IBinding {
 	 * returns true if this binding is qualified wrt the translation unit
 	 * for example, local variables, function parameters and local classes will
 	 * all return false.
-	 * @return
 	 * @throws DOMException
 	 */
 	public boolean isGloballyQualified() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java
index 1478d408f76..5f743d656ad 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassScope.java
@@ -20,7 +20,6 @@ public interface ICPPClassScope extends ICPPScope {
 	/**
 	 * Get the binding for the class this scope is associated with
 	 * 
-	 * @return
 	 */
 	ICPPClassType getClassType();
 
@@ -30,7 +29,6 @@ public interface ICPPClassScope extends ICPPScope {
 	 * code. The methods that will be implicitly declared are: the default
 	 * constructor, copy constructor, copy assignment operator, and destructor
 	 * 
-	 * @return
 	 */
 	public ICPPMethod[] getImplicitMethods();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java
index 22b96232d88..d7a1180f859 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java
@@ -35,14 +35,12 @@ public interface ICPPClassTemplatePartialSpecialization extends ICPPClassTemplat
 	
 	/**
 	 * get the arguments to this specialization
-	 * @return
 	 */
 	public IType [] getArguments() throws DOMException;
 	
 	
 	/**
 	 * get the ICPPTemplateDefinition which this is a specialization of
-	 * @return
 	 */
 	public ICPPClassTemplate getPrimaryClassTemplate() throws DOMException;
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java
index 6ff67f92962..09ff902de9d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassType.java
@@ -45,7 +45,6 @@ public interface ICPPClassType extends ICompositeType, ICPPBinding {
 	 * to be ambiguous a IProblemBinding is returned.
 	 * 
 	 * @param name
-	 * @return
 	 */
 	public IField findField(String name) throws DOMException;
 
@@ -89,7 +88,6 @@ public interface ICPPClassType extends ICompositeType, ICPPBinding {
 	 * for this class. This list includes both declared and implicit
 	 * constructors.
 	 * 
-	 * @return
 	 */
 	public ICPPConstructor[] getConstructors() throws DOMException;
 
@@ -97,14 +95,12 @@ public interface ICPPClassType extends ICompositeType, ICPPBinding {
 	 * return an array of bindings for those classes/functions declared as
 	 * friends of this class.
 	 * 
-	 * @return
 	 * @throws DOMException
 	 */
 	public IBinding[] getFriends() throws DOMException;
 	
 	/**
 	 * return an array of nested classes/structures
-	 * @return
 	 * @throws DOMException
 	 */
 	public ICPPClassType [] getNestedClasses() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPConstructor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPConstructor.java
index 173dd973bb9..a27043b81cc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPConstructor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPConstructor.java
@@ -23,7 +23,6 @@ public interface ICPPConstructor extends ICPPMethod {
 	/**
 	 * Whether or not this constructor was declared as explicit
 	 * 
-	 * @return
 	 * @throws DOMException
 	 */
 	boolean isExplicit() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java
index 688cee8e997..a49726ece14 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java
@@ -25,7 +25,6 @@ public interface ICPPFunction extends IFunction, ICPPBinding {
 
     /**
      * does this function have the mutable storage class specifier
-     * @return
      * @throws DOMException
      */
     public boolean isMutable() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionScope.java
index e83278c1166..9a3dc36e4ea 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionScope.java
@@ -25,7 +25,6 @@ public interface ICPPFunctionScope extends ICPPScope {
 	 * Get the scope representing the function body. returns null if there is no
 	 * function definition
 	 * 
-	 * @return
 	 * @throws DOMException
 	 */
 	public IScope getBodyScope() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionType.java
index d27a24e179b..30373ccf691 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunctionType.java
@@ -24,13 +24,11 @@ public interface ICPPFunctionType extends IFunctionType {
 
 	/**
 	 * returns true for a constant method
-	 * @return
 	 */
 	public boolean isConst();
 	
 	/**
 	 * returns true for a volatile method
-	 * @return
 	 */
 	public boolean isVolatile();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMember.java
index 352dacaf1d7..5bb8e5e8b44 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMember.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMember.java
@@ -22,7 +22,6 @@ public interface ICPPMember extends ICPPBinding{
 	/**
 	 * The visibility.
 	 * 
-	 * @return
 	 */
 	public int getVisibility() throws DOMException;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMethod.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMethod.java
index e7277345607..6bf0e9f028e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMethod.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPMethod.java
@@ -20,7 +20,6 @@ public interface ICPPMethod extends ICPPFunction, ICPPMember {
 	
 	/**
 	 * is this a virtual method
-	 * @return
 	 * @throws DOMException
 	 */
 	public boolean isVirtual() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNamespace.java
index c3bd261e2d7..3b3f659c968 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNamespace.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNamespace.java
@@ -25,14 +25,12 @@ public interface ICPPNamespace extends ICPPBinding {
 	/**
 	 * get the scope object associated with this namespace
 	 * 
-	 * @return
 	 * @throws DOMException
 	 */
 	public ICPPNamespaceScope getNamespaceScope() throws DOMException;
 	
 	/**
 	 * get an array of the all the bindings declared in this namespace.
-	 * @return
 	 * @throws DOMException
 	 */
 	public IBinding [] getMemberBindings() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPointerToMemberType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPointerToMemberType.java
index d18fe864c0f..8a4e8742355 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPointerToMemberType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPointerToMemberType.java
@@ -24,7 +24,6 @@ public interface ICPPPointerToMemberType extends IPointerType {
 	/**
 	 * Get the class to whose members this points to
 	 * 
-	 * @return
 	 */
 	public ICPPClassType getMemberOfClass();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPReferenceType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPReferenceType.java
index c736b9a944a..c9ffb363027 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPReferenceType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPReferenceType.java
@@ -21,10 +21,10 @@ import org.eclipse.cdt.core.dom.ast.IType;
  * @author aniefer
  */
 public interface ICPPReferenceType extends IType {
+	
 	/**
 	 * get the type that this is a reference of
 	 * 
-	 * @return
 	 * @throws DOMException
 	 */
 	public IType getType() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateInstance.java
index 9f8d0c235f4..d2e5b736ce6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateInstance.java
@@ -27,13 +27,11 @@ public interface ICPPTemplateInstance extends ICPPSpecialization {
 	
 	/**
 	 * get the template that this was instantiated from
-	 * @return
 	 */
 	public ICPPTemplateDefinition getTemplateDefinition();
 	
 	/**
 	 * get the types of the arguments the template was instantiated with.
-	 * @return
 	 */
 	public IType[] getArguments();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java
index 6fb1f7a4724..2bddb95c134 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateNonTypeParameter.java
@@ -22,7 +22,6 @@ public interface ICPPTemplateNonTypeParameter extends ICPPTemplateParameter,
 	/**
 	 * The default value for this parameter.
 	 * 
-	 * @return
 	 */
 	public IASTExpression getDefault();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateScope.java
index f6b79efd9f1..8b17248196a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateScope.java
@@ -23,7 +23,6 @@ public interface ICPPTemplateScope extends ICPPScope {
 
 	/**
 	 * get the template that this scope represents
-	 * @return
 	 */
 	public ICPPTemplateDefinition getTemplateDefinition() throws DOMException;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java
index 99f42aa41e8..a15c2bdee33 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java
@@ -26,7 +26,6 @@ public interface ICPPTemplateTemplateParameter extends ICPPTemplateParameter, IC
 	/**
 	 * The default type for this parameter. May be null
 	 * 
-	 * @return
 	 */
 	public IType getDefault() throws DOMException;
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java
index 16e788e3e15..3c509d76c9b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java
@@ -21,7 +21,6 @@ public interface ICPPTemplateTypeParameter extends ICPPTemplateParameter, IType
 	/**
 	 * The default type for this parameter. May be null
 	 * 
-	 * @return
 	 */
 	public IType getDefault() throws DOMException;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPUsingDeclaration.java
index c4c63a31621..d0c716410a1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPUsingDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPUsingDeclaration.java
@@ -21,11 +21,11 @@ import org.eclipse.cdt.core.dom.ast.IBinding;
  * @author aniefer
  */
 public interface ICPPUsingDeclaration extends ICPPBinding {
+	
     /**
      * Return an array of bindings that were declared by this using declaration.
      * Each of these bindings delegates to some previously declared binding to which it
      * is a reference. 
-     * @return
      */
     IBinding[] getDelegates();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariable.java
index 704defb2b64..b0317158cd8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPVariable.java
@@ -22,9 +22,9 @@ import org.eclipse.cdt.core.dom.ast.IVariable;
  * @author aniefer
  */
 public interface ICPPVariable extends IVariable, ICPPBinding {
+	
     /**
      * does this variable have the mutable storage class specifier
-     * @return
      * @throws DOMException
      */
     public boolean isMutable() throws DOMException;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java
index 3bffba464dc..ecabd788c79 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java
@@ -71,9 +71,7 @@ public interface ICASTKnRFunctionDeclarator extends IASTFunctionDeclarator, IAST
 	/**
 	 * Map declarator to IASTName.
 	 * 
-	 * @param name
-	 *            <code>IASTName</code>
-	 * @return
+	 * @param name <code>IASTName</code>
 	 */
 	public IASTDeclarator getDeclaratorForParameterName(IASTName name);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPPointerType.java
index 24fcb91816b..207b6d4441d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPPointerType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPPointerType.java
@@ -22,8 +22,6 @@ import org.eclipse.cdt.core.dom.ast.IPointerType;
 public interface IGPPPointerType extends IPointerType {
 	/**
 	 * is this a restrict pointer
-	 * 
-	 * @return
 	 */
 	boolean isRestrict();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPQualifierType.java
index f1b01c22963..9b8b7867b37 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPQualifierType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPQualifierType.java
@@ -23,7 +23,6 @@ public interface IGPPQualifierType extends IQualifierType {
 	/**
 	 * is this a restrict type
 	 * 
-	 * @return
 	 */
 	public boolean isRestrict();
 }