diff --git a/auto-insert/cpp b/auto-insert/cpp
index 321b301..450fc30 100644
--- a/auto-insert/cpp
+++ b/auto-insert/cpp
@@ -14,4 +14,5 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "`(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`.hpp"
 
diff --git a/auto-insert/hpp b/auto-insert/hpp
index c2306dd..57663e7 100644
--- a/auto-insert/hpp
+++ b/auto-insert/hpp
@@ -14,8 +14,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ${1:`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_`(upcase (file-name-extension (buffer-file-name)))`}
+#ifndef ${1:`(upcase (projectile-project-name))`_`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_`(upcase (file-name-extension (buffer-file-name)))`}
 #define $1
 
+$0
 
-#endif  // $1
\ No newline at end of file
+#endif  // $1