diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
index 5ce26e2997b..a99fa80dd3a 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
@@ -250,7 +250,7 @@ public class MakeCorePlugin extends Plugin {
 						for (int j = 0; j < configElements.length; j++) {
 							IConfigurationElement[] runElement = configElements[j].getChildren("run"); //$NON-NLS-1$
 							if (runElement.length > 0) { 
-								IExternalScannerInfoProvider builder = (IExternalScannerInfoProvider) runElement[0].createExecutableExtension("class");
+								IExternalScannerInfoProvider builder = (IExternalScannerInfoProvider) runElement[0].createExecutableExtension("class"); //$NON-NLS-1$
 								return builder;
 							}
 						}
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java
index bf99828294c..c24c81fb1b4 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java
@@ -48,7 +48,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 	private static String TARGETS_EXT = "targets"; //$NON-NLS-1$
 
 	private ListenerList listeners = new ListenerList();
-	private HashMap projectMap = new HashMap();
+	Map projectMap = new HashMap();
 	private HashMap builderMap;
 	protected Vector fProjects = new Vector();
 
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java
index 572d9fe1243..c43177a7041 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java
@@ -33,7 +33,7 @@ import org.w3c.dom.NodeList;
 
 public class ProjectTargets {
 
-	private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets";
+	private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets"; //$NON-NLS-1$
 	private static final String TARGETS_EXT = "targets"; //$NON-NLS-1$
 
 	private static final String BUILD_TARGET_ELEMENT = "buildTargets"; //$NON-NLS-1$
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java
index 0f636256682..13231f1dcf3 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java
@@ -85,7 +85,7 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer
 			new ProgressMonitorDialog(getShell()).run(false, true, op);
 		} catch (InvocationTargetException e) {
 			Throwable e1 = e.getTargetException();
-			MakeUIPlugin.errorDialog(getShell(), MakeUIPlugin.getResourceString("MakeProjectPropertyPage.internalError"),e1.toString(), e1);
+			MakeUIPlugin.errorDialog(getShell(), MakeUIPlugin.getResourceString("MakeProjectPropertyPage.internalError"),e1.toString(), e1); //$NON-NLS-1$
 			return false;
 		} catch (InterruptedException e) {
 			// cancelled
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java
index 0cc36fd3fc5..a1c76a57d8d 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java
@@ -20,8 +20,8 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 
 public class BuildTargetDialog extends Dialog {
-	private TargetListViewerPart targetPart;
-	private IContainer fContainer;
+	TargetListViewerPart targetPart;
+	IContainer fContainer;
 
 	public BuildTargetDialog(Shell shell, IContainer container) {
 		super(shell);
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java
index 316a389624f..2596fa03904 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java
@@ -74,9 +74,9 @@ public class SettingsBlock extends AbstractCOptionPage {
 	Button incrButton;
 	Button autoButton;
 
-	private IMakeBuilderInfo fBuildInfo;
-	private Preferences fPrefs;
-	private String fBuilderID;
+	IMakeBuilderInfo fBuildInfo;
+	Preferences fPrefs;
+	String fBuilderID;
 
 	public SettingsBlock(Preferences prefs, String builderID) {
 		super(MakeUIPlugin.getResourceString(MAKE_LABEL));
@@ -354,15 +354,15 @@ public class SettingsBlock extends AbstractCOptionPage {
 		targetFull.setText(info.getFullBuildTarget());
 	}
 
-	private boolean isStopOnError() {
+	boolean isStopOnError() {
 		return stopOnErrorButton.getSelection();
 	}
 
-	private boolean useDefaultBuildCmd() {
+	boolean useDefaultBuildCmd() {
 		return defButton.getSelection();
 	}
 
-	private String getBuildLine() {
+	String getBuildLine() {
 		if (buildCommand != null) {
 			String cmd = buildCommand.getText();
 			if (cmd != null)
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java
index 289dc587011..63630935a05 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java
@@ -56,7 +56,7 @@ public class GDBSolibBlock extends Observable implements Observer
 				
 		if ( autoSolib )
 		{	
-			fAutoSoLibButton = ControlFactory.createCheckBox( subComp, MIUIPlugin.getResourceString("mi.internal.ui.GDBSolibBlock.Load_shared_lib_symbols_automatically") );
+			fAutoSoLibButton = ControlFactory.createCheckBox( subComp, MIUIPlugin.getResourceString("mi.internal.ui.GDBSolibBlock.Load_shared_lib_symbols_automatically") ); //$NON-NLS-1$
 			fAutoSoLibButton.addSelectionListener( 
 										new SelectionAdapter()
 											{
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
index defb00de4a9..39fe316b887 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
@@ -107,7 +107,6 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
 		private boolean fEdit = false;
 
 		private Button fBtnOk = null;
-		private Button fBtnCancel = null;
 		private Text fTextName = null;
 		private Text fTextValue = null;
 
@@ -175,7 +174,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
 
 		protected void createButtonsForButtonBar(Composite parent) {
 			fBtnOk = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-			fBtnCancel = createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+			createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
 		}
 
 		protected void updateButtonsState() {
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
index 4063527d414..1540de42fc1 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
@@ -335,7 +335,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 			return;
 		}
 
-		Object [] results = (Object [])dialog.getResult();
+		Object [] results = dialog.getResult();
 		
 		try {
 			fProgText.setText(((IResource)results[0]).getProjectRelativePath().toString());