diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFileSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFileSet.java
index bfe5d1ed5cb..c7309b66196 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFileSet.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFileSet.java
@@ -6,19 +6,18 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
+ *     Markus Schorn - initial API and implementation
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.index;
 
 import org.eclipse.core.runtime.CoreException;
 
 public interface IIndexFragmentFileSet {
-
 	/**
 	 * Returns whether the file-set contains the file of the local binding.
 	 * @throws CoreException 
 	 */
-	boolean containsFileOfLocalBinding(IIndexFragmentBinding fb) throws CoreException;
+	boolean containsFileOfLocalBinding(IIndexFragmentBinding binding) throws CoreException;
 
 	/**
 	 * Adds the fragment file to the file-set.
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileSet.java
index 854a486cc67..14489d061c3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileSet.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileSet.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
+ *     Markus Schorn - initial API and implementation
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.index;
 
@@ -150,7 +150,7 @@ public class IndexFileSet implements IIndexFileSet {
 		int j= ok.nextSetBit(0);
 		for (int i = 0; i < result.length; i++) {
 			result[i]= bindings[j];
-			j= ok.nextSetBit(j+1);
+			j= ok.nextSetBit(j + 1);
 		}
 		return result;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPath.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPath.java
index 6345deffafd..ea0c8f4f824 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPath.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPath.java
@@ -12,7 +12,6 @@ package org.eclipse.cdt.internal.core.parser.scanner;
 
 import java.util.List;
 
-
 /** 
  * Represents the include search path
  */
@@ -20,7 +19,6 @@ public final class IncludeSearchPath {
 	private final boolean fInhibitUseOfCurrentFileDirectory;
 	private final IncludeSearchPathElement[] fElements;
 
-	
 	IncludeSearchPath(List<IncludeSearchPathElement> elements, boolean inhibitUseOfCurrentFileDirectory) {
 		fElements= elements.toArray(new IncludeSearchPathElement[elements.size()]);
 		fInhibitUseOfCurrentFileDirectory= inhibitUseOfCurrentFileDirectory;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java
index 6948991ea8b..26fa99cd9c1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java
@@ -195,7 +195,7 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 		return tu;
 	}
 
-	private boolean canResolveUnresolvedInclude(IIndexFile file, IScannerInfo scannerInfo,
+	private static boolean canResolveUnresolvedInclude(IIndexFile file, IScannerInfo scannerInfo,
 			ProjectIndexerIncludeResolutionHeuristics includeResolutionHeuristics) {
 		try {
 			String filePath = IndexLocationFactory.getAbsolutePath(file.getLocation()).toOSString();
@@ -214,7 +214,7 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 		return false;
 	}
 
-	private boolean canResolveInclude(IIndexInclude include, String currentFile, long timestamp,
+	private static boolean canResolveInclude(IIndexInclude include, String currentFile, long timestamp,
 			IncludeSearchPath includeSearchPath,
 			ProjectIndexerIncludeResolutionHeuristics includeResolutionHeuristics) throws CoreException {
 		String includeName = include.getFullName();
@@ -259,7 +259,7 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 	/**
 	 * Returns true if the file exists and is not older than the given timestamp.
 	 */
-	private boolean fileIsNotOlderThanTimestamp(String filename, long timestamp) {
+	private static boolean fileIsNotOlderThanTimestamp(String filename, long timestamp) {
 		// We are subtracting 1 second from the timestamp to account for limited precision
 		// of File.lastModified() method and possible skew between clocks on a multi-CPU
 		// system. This may produce false positives, but they are pretty harmless.