diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/DefaultRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/DefaultRule.java
index cf7598a0ab7..e934bb2652e 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/DefaultRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/DefaultRule.java
@@ -20,7 +20,7 @@ import org.eclipse.cdt.make.core.makefile.IDefaultRule;
 public class DefaultRule extends SpecialRule implements IDefaultRule {
 
 	public DefaultRule(Directive parent, Command[] cmds) {
-		super(parent, new Target(".DEFAULT"), new String[0], cmds);
+		super(parent, new Target(".DEFAULT"), new String[0], cmds); //$NON-NLS-1$
 	}
 
 }
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/EmptyLine.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/EmptyLine.java
index ba98ed3428f..0553cb1f3a4 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/EmptyLine.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/EmptyLine.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.make.core.makefile.IEmptyLine;
 public class EmptyLine extends Directive implements IEmptyLine {
 
 	final public static char NL = '\n';
-	final public static String NL_STRING = "\n";
+	final public static String NL_STRING = "\n"; //$NON-NLS-1$
 
 	public EmptyLine(Directive parent) {
 		super(parent);
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/IgnoreRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/IgnoreRule.java
index cb023e60bfe..80b35c48ea8 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/IgnoreRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/IgnoreRule.java
@@ -21,7 +21,7 @@ import org.eclipse.cdt.make.core.makefile.IIgnoreRule;
 public class IgnoreRule extends SpecialRule implements IIgnoreRule {
 
 	public IgnoreRule(Directive parent, String[] reqs) {
-		super(parent, new Target(".IGNORE"), reqs, new Command[0]);
+		super(parent, new Target(".IGNORE"), reqs, new Command[0]); //$NON-NLS-1$
 	}
 
 }
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/InferenceRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/InferenceRule.java
index 01b0a92168c..151f20386a9 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/InferenceRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/InferenceRule.java
@@ -31,7 +31,7 @@ public class InferenceRule extends Rule {
 	 */
 	public String toString() {
 		StringBuffer buffer = new StringBuffer();
-		buffer.append(getTarget().toString()).append(":\n");
+		buffer.append(getTarget().toString()).append(":\n"); //$NON-NLS-1$
 		ICommand[] cmds = getCommands();
 		for (int i = 0; i < cmds.length; i++) {
 			buffer.append(cmds[i].toString());
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java
index 80191e5ca95..853b9413dcb 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java
@@ -34,7 +34,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 	}
 
 	public void setName(String n) {
-		name = (n == null) ? "" : n.trim() ;
+		name = (n == null) ? "" : n.trim() ; //$NON-NLS-1$
 	}
 
 	public StringBuffer getValue() {
@@ -46,7 +46,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 	 */
 	public String toString() {
 		StringBuffer buffer = new StringBuffer();
-		buffer.append(getName()).append(" = ").append(getValue()).append('\n');
+		buffer.append(getName()).append(" = ").append(getValue()).append('\n'); //$NON-NLS-1$
 		return buffer.toString();
 	}
 
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PosixRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PosixRule.java
index e82abe9369b..5ab25e01a9d 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PosixRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PosixRule.java
@@ -20,6 +20,6 @@ import org.eclipse.cdt.make.core.makefile.IPosixRule;
 public class PosixRule extends SpecialRule implements IPosixRule {
 
 	public PosixRule(Directive parent) {
-		super(parent, new Target(".POSIX"), new String[0], new Command[0]);
+		super(parent, new Target(".POSIX"), new String[0], new Command[0]); //$NON-NLS-1$
 	}
 }
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PreciousRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PreciousRule.java
index 5d239a6ad76..6b4f278e1b2 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PreciousRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/PreciousRule.java
@@ -20,7 +20,7 @@ import org.eclipse.cdt.make.core.makefile.IPreciousRule;
 public class PreciousRule extends SpecialRule implements IPreciousRule {
 
 	public PreciousRule(Directive parent, String[] reqs) {
-		super(parent, new Target(".PRECIOUS"), reqs, new Command[0]);
+		super(parent, new Target(".PRECIOUS"), reqs, new Command[0]); //$NON-NLS-1$
 	}
 
 }
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SccsGetRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SccsGetRule.java
index c13f25ab4f5..1e089a46c5d 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SccsGetRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SccsGetRule.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.make.core.makefile.ISccsGetRule;
 public class SccsGetRule extends SpecialRule implements ISccsGetRule {
 
 	public SccsGetRule(Directive parent, Command[] cmds) {
-		super(parent, new Target(".SCCS_GET"), new String[0], cmds);
+		super(parent, new Target(".SCCS_GET"), new String[0], cmds); //$NON-NLS-1$
 	}
 
 }
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SilentRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SilentRule.java
index 6a33ebf0c76..0576f4dfac6 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SilentRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SilentRule.java
@@ -21,7 +21,7 @@ import org.eclipse.cdt.make.core.makefile.ISilentRule;
 public class SilentRule extends SpecialRule implements ISilentRule {
 
 	public SilentRule(Directive parent, String[] reqs) {
-		super(parent, new Target(".SILENT"), reqs, new Command[0]);
+		super(parent, new Target(".SILENT"), reqs, new Command[0]); //$NON-NLS-1$
 	}
 
 }
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SpecialRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SpecialRule.java
index 18d2dd0ae2b..6d90d7f521c 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SpecialRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SpecialRule.java
@@ -31,7 +31,7 @@ public abstract class SpecialRule extends Rule implements ISpecialRule {
 
 	public String toString() {
 		StringBuffer sb = new StringBuffer();
-		sb.append(target).append(":");
+		sb.append(target).append(':');
 		String[] reqs = getPrerequisites();
 		for (int i = 0; i < reqs.length; i++) {
 			sb.append(' ').append(reqs[i]);
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SuffixesRule.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SuffixesRule.java
index abec32bf6ea..b54797f8830 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SuffixesRule.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SuffixesRule.java
@@ -21,7 +21,7 @@ import org.eclipse.cdt.make.core.makefile.ISuffixesRule;
 public class SuffixesRule extends SpecialRule implements ISuffixesRule {
 
 	public SuffixesRule(Directive parent, String[] suffixes) {
-		super(parent, new Target(".SUFFIXES"), suffixes, new Command[0]);
+		super(parent, new Target(".SUFFIXES"), suffixes, new Command[0]); //$NON-NLS-1$
 	}
 
 }
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Util.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Util.java
index 296f382cb5e..4ab81cb725e 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Util.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Util.java
@@ -19,11 +19,11 @@ public class Util {
 	}
 
 	public static boolean isCommand(String line) {
-		return line.length() > 1 && line.startsWith("\t");
+		return line.length() > 1 && line.startsWith("\t"); //$NON-NLS-1$
 	}
 
 	public static boolean isEscapedLine(String line) {
-		return (line.endsWith("\\") && !line.endsWith("\\\\"));
+		return (line.endsWith("\\") && !line.endsWith("\\\\")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	public static boolean isEmptyLine(String line) {