diff --git a/source/_includes/notes/links.html.twig b/source/_includes/notes/links.html.twig
new file mode 100644
index 000000000..374fd3dc7
--- /dev/null
+++ b/source/_includes/notes/links.html.twig
@@ -0,0 +1,9 @@
+{% if links is not empty %}
+  <h2>Links</h2>
+
+  <ul>
+    {% for url in links %}
+      <li><a href="{{ url }}">{{ url }}</a></li>
+    {% endfor %}
+  </ul>
+{% endif %}
diff --git a/source/_includes/notes/related.html.twig b/source/_includes/notes/related.html.twig
new file mode 100644
index 000000000..0caea6051
--- /dev/null
+++ b/source/_includes/notes/related.html.twig
@@ -0,0 +1,13 @@
+{% if related and notes %}
+  <section>
+    <h2>Related</h2>
+
+    <ul>
+      {% for note in notes if related|filter((title) => title == note.title) %}
+        <li>
+          <a href="{{ note.url|trim('/', 'right') }}">{{ note.title }}</a>
+        </li>
+      {% endfor %}
+    </ul>
+  </section>
+{% endif %}
diff --git a/source/_includes/notes/tags.html.twig b/source/_includes/notes/tags.html.twig
new file mode 100644
index 000000000..3cefffa5e
--- /dev/null
+++ b/source/_includes/notes/tags.html.twig
@@ -0,0 +1,10 @@
+{% if tags is not empty %}
+  <h2>Tags</h2>
+
+  <ul>
+    {% for tag in tags|sort %}
+      <li>{{ tag }}</li>
+    {% endfor %}
+  </ul>
+{% endif %}
+
diff --git a/source/_layouts/note.html.twig b/source/_layouts/note.html.twig
index dfac32b82..bf7ac5d79 100644
--- a/source/_layouts/note.html.twig
+++ b/source/_layouts/note.html.twig
@@ -13,37 +13,13 @@
 
   {% block content %}{% endblock %}
 
-  {% if page.links is not empty %}
-    <h2>Links</h2>
+  {% include "notes/links" with { links: page.links } %}
 
-    <ul>
-      {% for url in page.links %}
-        <li><a href="{{ url }}">{{ url }}</a></li>
-      {% endfor %}
-    </ul>
-  {% endif %}
+  {% include "notes/related" with {
+    notes: data.notes,
+    related: page.related,
+  } %}
 
-  {% if page.tags is not empty %}
-    <h2>Tags</h2>
+{% include "notes/tags" with { tags: page.tags } %}
 
-    <ul>
-      {% for tag in page.tags|sort %}
-        <li>{{ tag }}</li>
-      {% endfor %}
-    </ul>
-  {% endif %}
-
-  {% if page.related and data.notes %}
-    <section>
-      <h2>Related</h2>
-
-      <ul>
-        {% for note in data.notes if page.related|filter((title) => title == note.title) %}
-          <li>
-            <a href="{{ note.url|trim('/', 'right') }}">{{ note.title }}</a>
-          </li>
-        {% endfor %}
-      </ul>
-    </section>
-  {% endif %}
 {% endblock %}