diff --git a/private/templates/c++-mode/@@.cpp b/private/templates/c++-mode/@@.cpp
index d8664729a..d729f5573 100644
--- a/private/templates/c++-mode/@@.cpp
+++ b/private/templates/c++-mode/@@.cpp
@@ -5,12 +5,10 @@
 /**
  * @file
  * @author  `user-full-name` <`user-mail-address`>
- * @version ${1:0.1}
- * @since   $1 @ `(format-time-string "%Y-%m-%d")`
- *
- * @section DESCRIPTION
- *
- * ${2:Some description of this file}
+ * @version 0.1
+ * @since   0.1 @ `(format-time-string "%Y-%m-%d")`
  */
 
+#include "`(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`.h"
+
 $0
diff --git a/private/templates/c++-mode/@@main.cpp b/private/templates/c++-mode/@@main.cpp
index 0303d3e7d..5a8eb60e0 100644
--- a/private/templates/c++-mode/@@main.cpp
+++ b/private/templates/c++-mode/@@main.cpp
@@ -5,16 +5,10 @@
 /**
  * @file
  * @author  `user-full-name` <`user-mail-address`>
- * @version ${1:0.1}
- *
- * @section DESCRIPTION
- *
- * ${2:Some description of this file}
+ * @version 0.1
  */
 
 #include <iostream>
-#include <string>
-#include <vector>
 
 using namespace std;
 
diff --git a/private/templates/c++-mode/@@winmain.cpp b/private/templates/c++-mode/@@winmain.cpp
index da3cc49be..4b97a3f04 100644
--- a/private/templates/c++-mode/@@winmain.cpp
+++ b/private/templates/c++-mode/@@winmain.cpp
@@ -5,12 +5,8 @@
 /**
  * @file
  * @author  `user-full-name` <`user-mail-address`>
- * @version ${1:0.1}
- * @since   $1 @ `(format-time-string "%Y-%m-%d")`
- *
- * @section DESCRIPTION
- *
- * ${2:Some description of this file}
+ * @version 0.1
+ * @since   0.1 @ `(format-time-string "%Y-%m-%d")`
  */
 
 #include <Windows.h>