diff --git a/private/templates/c++-mode/__cpp b/private/templates/c++-mode/__cpp
new file mode 100644
index 000000000..10f8293e1
--- /dev/null
+++ b/private/templates/c++-mode/__cpp
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# group: file templates
+# contributor: Henrik Lissner
+# --
+#include "`(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`.h"
+
+$0
diff --git a/private/templates/c++-mode/__h b/private/templates/c++-mode/__h
new file mode 100644
index 000000000..b58beb13a
--- /dev/null
+++ b/private/templates/c++-mode/__h
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# group: file templates
+# contributor: Henrik Lissner
+# --
+#ifndef ${1:__`(upcase (f-base buffer-file-name))`_H_$(upcase yas-text)}
+#define $1
+
+$0
+
+#endif // $1
diff --git a/private/templates/c-mode/__c b/private/templates/c-mode/__c
new file mode 100644
index 000000000..10f8293e1
--- /dev/null
+++ b/private/templates/c-mode/__c
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# group: file templates
+# contributor: Henrik Lissner
+# --
+#include "`(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`.h"
+
+$0