diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 50b2c3b504a..bcaf82c244d 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,6 @@
+2004-02-06 Hoda Amer
+	Fix for Bug#51208: NullPointerException in CModelBuilder
+	
 2004-02-05 Alain Magloire
                                                                                                                              
     PR 50810
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java
index 40b444271f4..cd1bec8a577 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java
@@ -122,7 +122,9 @@ public class CModelBuilder {
 			parser = ParserFactory.createParser( 
 				ParserFactory.createScanner( 
 					new StringReader( code ), 
-					translationUnit.getUnderlyingResource().getLocation().toOSString(), 
+					(translationUnit.getUnderlyingResource() != null ? 
+					 translationUnit.getUnderlyingResource().getLocation().toOSString() :
+					 ""),
 					scanInfo, 
 					mode, 
 					language, 
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 04151031187..732c5ecbd5b 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-06 Hoda Amer
+	- Patch for Keith Campbell: Default template file change ( for statement )
+	- Patch for Chris Wiebe: Better header file icon
+	
 2004-02-05 Alain Magloire
 
 	Patch from Chris Wiebe
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml
index 5be99d3854b..fe66840f0b9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml
@@ -10,13 +10,13 @@ All Rights Reserved.
 <!-- C++ -->
 
 <template description="for loop" name="for" context="C Function">
-for (${var} = 0; ${var} &lt; ${max}; ${var}++) {
+for (${var} = 0; ${var} &lt; ${max}; ++${var}) {
 	${cursor}
 }
 </template>
 
 <template description="for loop with temporary variable" name="for" context="C Function">
-for (int ${var} = 0; ${var} &lt; ${max}; ${var}++) {
+for (int ${var} = 0; ${var} &lt; ${max}; ++${var}) {
 	${cursor}
 }
 </template>