diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java
index 85c411f85ee..fcc980b5193 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java
@@ -60,14 +60,14 @@ public class InclusionTests extends PreprocessorTestsBase {
 	
 	public final static int SIZEOF_TRUTHTABLE = 10;
 
-	private IFile importFile(String fileName, String contents ) throws Exception{
+	private IFile importFile(String fileName, String contents) throws Exception {
     	if (fProject == null) {
     		fProject= CProjectHelper.createCProject(getClass().getName(), null, PDOMNullIndexer.ID);
     	}
     	return TestSourceReader.createFile(fProject.getProject(), fileName, contents);
 	}
 
-    private IFolder importFolder(String name) throws Exception{
+    private IFolder importFolder(String name) throws Exception {
     	if (fProject == null) {
     		fProject= CProjectHelper.createCProject(getClass().getName(), null, PDOMNullIndexer.ID);
     	}
@@ -81,7 +81,7 @@ public class InclusionTests extends PreprocessorTestsBase {
     // #include "one.h"
     // #include "f1/two.h"
     // #include "f1/f2/three.h"
-    public void testIncludeVariables_69529() throws Exception	{    
+    public void testIncludeVariables_69529() throws Exception {    
     	String content= getAboveComment();
 
     	IFolder f0 = importFolder(".framework"); 
@@ -108,7 +108,7 @@ public class InclusionTests extends PreprocessorTestsBase {
     	validateEOF();
     }
 
-    public void testIncludeNext() throws Exception	{    	
+    public void testIncludeNext() throws Exception {    	
     	String baseFile = "int zero; \n#include \"foo.h\""; //$NON-NLS-1$
     	String i1Next = "int one; \n#include_next <bar/foo.h>"; //$NON-NLS-1$
     	String i2Next = "int two; \n#include_next \"bar/foo.h\""; //$NON-NLS-1$
@@ -152,8 +152,7 @@ public class InclusionTests extends PreprocessorTestsBase {
     	validateEOF();
 	}
 
-    public void testIncludePathOrdering() throws Exception
-	{    	
+    public void testIncludePathOrdering() throws Exception {    	
     	// create directory structure:
     	//  project/base.cpp
     	//  project/foo.h
@@ -233,7 +232,7 @@ public class InclusionTests extends PreprocessorTestsBase {
     }
     
     // #include <inc/test.h>
-    public void testRelativeIncludes_243170() throws Exception	{    
+    public void testRelativeIncludes_243170() throws Exception {    
     	String content= getAboveComment();
 
     	IFolder f0 = importFolder("f1"); 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java
index 9afec3dbe12..2f4e92ded14 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java
@@ -57,7 +57,7 @@ final class ScannerContext {
 	}
 	
 	public ScannerContext(ILocationCtx ctx, ScannerContext parent, TokenList tokens) {
-		this (ctx, parent, (Lexer) null);
+		this(ctx, parent, (Lexer) null);
 		fTokens= tokens.first();
 		fInactiveState= CodeState.eSkipInactive;  // no branches in result of macro expansion
 	}
@@ -169,7 +169,7 @@ final class ScannerContext {
 	}
 
 	private int getOldNestingLevel(BranchKind kind, int nesting) {
-		switch(kind) {
+		switch (kind) {
 		case eIf:
 			return nesting-1;
 		case eElif: