diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/src/Basename.c b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/src/Basename.c
index c9fd0add173..55c0e6a3f12 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/src/Basename.c
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/src/Basename.c
@@ -1,20 +1,17 @@
 /*
-============================================================================
+ ============================================================================
  Name        : $(baseName).cpp
  Author      : $(author)
  Version     :
  Copyright   : $(copyright)
- Description : Exe source file
-============================================================================
-*/
-/* Hello World in C, Ansi-style */
+ Description : Hello World in C, Ansi-style
+ ============================================================================
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
 
-int main(void)
-{
-  puts("$(message)");
-  return EXIT_SUCCESS;
+int main(void) {
+	puts("$(message)"); /* prints $(message) */
+	return EXIT_SUCCESS;
 }
-
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/src/Basename.cpp b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/src/Basename.cpp
index ce61112f2af..60eb0ebcd43 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/src/Basename.cpp
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/src/Basename.cpp
@@ -1,18 +1,15 @@
-/*
-============================================================================
- Name        : $(baseName).cpp
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Exe source file
-============================================================================
-*/
-/* Hello World in C++, Ansi-style */
+//============================================================================
+// Name        : $(baseName).cpp
+// Author      : $(author)
+// Version     :
+// Copyright   : $(copyright)
+// Description : Hello World in C++, Ansi-style
+//============================================================================
+
 #include <iostream>
 using namespace std;
 
-int main ()
-{
-  cout << "$(message)" << endl; // prints $(message)
-  return 0;
+int main() {
+	cout << "$(message)" << endl; // prints $(message)
+	return 0;
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/MakefileHelloWorldCCProject/src/Basename.cpp b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/MakefileHelloWorldCCProject/src/Basename.cpp
index c9fd0add173..38d4fdabde1 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/MakefileHelloWorldCCProject/src/Basename.cpp
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/MakefileHelloWorldCCProject/src/Basename.cpp
@@ -1,20 +1,15 @@
-/*
-============================================================================
- Name        : $(baseName).cpp
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Exe source file
-============================================================================
-*/
-/* Hello World in C, Ansi-style */
+//============================================================================
+// Name        : $(baseName).cpp
+// Author      : $(author)
+// Version     :
+// Copyright   : $(copyright)
+// Description : Hello World in C, Ansi-style
+//============================================================================
 
 #include <stdio.h>
 #include <stdlib.h>
 
-int main(void)
-{
-  puts("$(message)");
-  return EXIT_SUCCESS;
+int main(void) {
+	puts("$(message)");
+	return EXIT_SUCCESS;
 }
-