diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
index 720eb2f54bd..44ad4462c9c 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
@@ -1170,13 +1170,16 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
 	 * </pre>
 	 */
 	private int visit(ICPPASTUsingDeclaration node) {
-		scribe.printNextToken(Token.t_using);
-		if (node.isTypename()) {
-			scribe.printNextToken(Token.t_typename, true);
+		int token = peekNextToken();
+		if (token == Token.t_using)
+			scribe.printNextToken(token);
+		token = peekNextToken();
+		if (token == Token.t_typename) {
+			scribe.printNextToken(token, true);
 		}
 		scribe.space();
 		node.getName().accept(this);
-		int token = peekNextToken();
+		token = peekNextToken();
 		if (token == Token.tSEMI) {
 			scribe.printNextToken(token, preferences.insert_space_before_semicolon);
 		}