diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java
index 27f65b4e506..3d9eeb654f4 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java
@@ -49,7 +49,7 @@ public class MakeScannerProvider extends ScannerProvider {
 	// Name we will use to store build property with the project
 	private static final QualifiedName scannerInfoProperty = new QualifiedName(MakeCorePlugin.getUniqueIdentifier(),
 			"makeBuildInfo"); //$NON-NLS-1$
-	private static final String CDESCRIPTOR_ID = MakeCorePlugin.getUniqueIdentifier() + ".makeScannerInfo"; //$NON-NLS-1$
+	static final String CDESCRIPTOR_ID = MakeCorePlugin.getUniqueIdentifier() + ".makeScannerInfo"; //$NON-NLS-1$
 
 	public static final String INCLUDE_PATH = "includePath"; //$NON-NLS-1$
 	public static final String PATH = "path"; //$NON-NLS-1$
@@ -132,7 +132,7 @@ public class MakeScannerProvider extends ScannerProvider {
 		return info;
 	}
 
-	private static void migrateToCPathEntries(MakeScannerInfo info) throws CoreException {
+	static void migrateToCPathEntries(MakeScannerInfo info) throws CoreException {
 		Map symbols = info.getDefinedSymbols();
 		String[] includes = info.getIncludePaths();
 		ICProject cProject = CoreModel.getDefault().create(info.getProject());
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java
index da7fbb489b1..29363a49ada 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java
@@ -377,7 +377,7 @@ public class BuildInfoFactory {
 		}
 
 		protected String getString(String name) {
-			return args.get(name) != null ? (String)args.get(name) : "";
+			return args.get(name) != null ? (String)args.get(name) : ""; //$NON-NLS-1$
 		}
 
 		protected String getBuilderID() {
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
index 036d9870431..efaea92781c 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
@@ -38,7 +38,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 	private IPath buildCommand;
 	private boolean isDefaultBuildCmd;
 	private boolean isStopOnError;
-	private boolean runAllBuidlers = true;
+	boolean runAllBuidlers = true;
 	private String targetBuilderID;
 	private IContainer container;
 
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DefaultExternalScannerInfoProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DefaultExternalScannerInfoProvider.java
index 35bd88e0629..8262f6d8844 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DefaultExternalScannerInfoProvider.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DefaultExternalScannerInfoProvider.java
@@ -52,7 +52,7 @@ public class DefaultExternalScannerInfoProvider implements IExternalScannerInfoP
 	
 	private static final String EXTERNAL_SI_PROVIDER_ERROR = "ExternalScannerInfoProvider.Provider_Error"; //$NON-NLS-1$
 	private static final String EXTERNAL_SI_PROVIDER_CONSOLE_ID = MakeCorePlugin.getUniqueIdentifier() + ".ExternalScannerInfoProviderConsole";	//$NON-NLS-1$
-	private static final String LANG_ENV_VAR = "LANG";
+	private static final String LANG_ENV_VAR = "LANG"; //$NON-NLS-1$
 	
 	private IPath fWorkingDirectory;
 	private IPath fCompileCommand;
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathContainer.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathContainer.java
index 9227e128c8d..effcd0ee59e 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathContainer.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathContainer.java
@@ -32,7 +32,7 @@ public class DiscoveredPathContainer implements IPathEntryContainer {
 	public static IPath CONTAINER_ID = new Path("org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"); //$NON-NLS-1$
 
 	private final IProject fProject;
-	private static Map fgPathEntries;
+	static Map fgPathEntries;
 
 	public DiscoveredPathContainer(IProject project) {
 		fProject = project;
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java
index 7c2951016ca..27c9a56e8c8 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CygpathTranslator.java
@@ -32,8 +32,8 @@ import org.eclipse.core.runtime.Platform;
  */
 public class CygpathTranslator {
 	IProject project;
-	private String orgPath;
-	private String transPath;
+	String orgPath;
+	String transPath;
 
 	public CygpathTranslator(IProject project, String path) {
 		this.project = project;
@@ -61,7 +61,7 @@ public class CygpathTranslator {
 	/**
 	 * @return
 	 */
-	private String platformRun() {
+	String platformRun() {
 		CommandLauncher launcher = new CommandLauncher();
 		launcher.showCommand(false);