diff --git a/cpp/ql/src/Likely Bugs/JapaneseEra/ConstructorOrMethodWithExactEraDate.qhelp b/cpp/ql/src/Likely Bugs/JapaneseEra/ConstructorOrMethodWithExactEraDate.qhelp
index 1335deaba43..92753c2804d 100644
--- a/cpp/ql/src/Likely Bugs/JapaneseEra/ConstructorOrMethodWithExactEraDate.qhelp	
+++ b/cpp/ql/src/Likely Bugs/JapaneseEra/ConstructorOrMethodWithExactEraDate.qhelp	
@@ -11,7 +11,7 @@
 
 <references>
   <li>
-    <a href="https://blogs.msdn.microsoft.com/shawnste/2018/04/12/the-japanese-calendars-y2k-moment/">The Japanese Calendar’s Y2K Moment</a>.
+    <a href="https://blogs.msdn.microsoft.com/shawnste/2018/04/12/the-japanese-calendars-y2k-moment/">The Japanese Calendar's Y2K Moment</a>.
   </li>
 </references>
 </qhelp>
diff --git a/cpp/ql/src/Likely Bugs/JapaneseEra/StructWithExactEraDate.qhelp b/cpp/ql/src/Likely Bugs/JapaneseEra/StructWithExactEraDate.qhelp
index 703a421ec0f..f009401099a 100644
--- a/cpp/ql/src/Likely Bugs/JapaneseEra/StructWithExactEraDate.qhelp	
+++ b/cpp/ql/src/Likely Bugs/JapaneseEra/StructWithExactEraDate.qhelp	
@@ -11,7 +11,7 @@
 
 <references>
   <li>
-    <a href="https://blogs.msdn.microsoft.com/shawnste/2018/04/12/the-japanese-calendars-y2k-moment/">The Japanese Calendar’s Y2K Moment</a>.
+    <a href="https://blogs.msdn.microsoft.com/shawnste/2018/04/12/the-japanese-calendars-y2k-moment/">The Japanese Calendar's Y2K Moment</a>.
   </li>
 </references>
 </qhelp>
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/Adding365daysPerYear.qhelp b/cpp/ql/src/Likely Bugs/Leap Year/Adding365daysPerYear.qhelp
index c985456135c..091b5a227e2 100644
--- a/cpp/ql/src/Likely Bugs/Leap Year/Adding365daysPerYear.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Leap Year/Adding365daysPerYear.qhelp	
@@ -15,6 +15,8 @@ of days.  Alternatively, use an established library routine that already contain
 </recommendation>
 
 <references>
-  <include src="LeapYearReferences.qhelp" />
+  <li>U.S. Naval Observatory Website - <a href="https://aa.usno.navy.mil/faq/docs/calendars.php"> Introduction to Calendars</a></li>
+  <li>Wikipedia - <a href="https://en.wikipedia.org/wiki/Leap_year_bug"> Leap year bug</a> </li>
+  <li>Microsoft Azure blog - <a href="https://azure.microsoft.com/en-us/blog/is-your-code-ready-for-the-leap-year/"> Is your code ready for the leap year?</a> </li>
 </references>
 </qhelp>
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/LeapYearReferences.qhelp b/cpp/ql/src/Likely Bugs/Leap Year/LeapYearReferences.qhelp
deleted file mode 100644
index c6c7c03a725..00000000000
--- a/cpp/ql/src/Likely Bugs/Leap Year/LeapYearReferences.qhelp	
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<fragment>
-  <li>U.S. Naval Observatory Website - <a href="https://aa.usno.navy.mil/faq/docs/calendars.php"> Introduction to Calendars</a></li>
-  <li>Wikipedia - <a href="https://en.wikipedia.org/wiki/Leap_year_bug"> Leap year bug</a> </li>
-  <li>Microsoft Azure blog - <a href="https://azure.microsoft.com/en-us/blog/is-your-code-ready-for-the-leap-year/"> Is your code ready for the leap year?</a> </li>
-</fragment>
-</qhelp>
\ No newline at end of file
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification.qhelp b/cpp/ql/src/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification.qhelp
index ad3544373ed..60072ead07d 100644
--- a/cpp/ql/src/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification.qhelp	
@@ -22,6 +22,8 @@
 </example>
 
 <references>
-  <include src="LeapYearReferences.qhelp" />
+  <li>U.S. Naval Observatory Website - <a href="https://aa.usno.navy.mil/faq/docs/calendars.php"> Introduction to Calendars</a></li>
+  <li>Wikipedia - <a href="https://en.wikipedia.org/wiki/Leap_year_bug"> Leap year bug</a> </li>
+  <li>Microsoft Azure blog - <a href="https://azure.microsoft.com/en-us/blog/is-your-code-ready-for-the-leap-year/"> Is your code ready for the leap year?</a> </li>
 </references>
 </qhelp>
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.qhelp b/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.qhelp
index 3b25631eaf4..63493d6676a 100644
--- a/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.qhelp	
@@ -7,18 +7,19 @@
   
 <p>When using a function that transforms a date structure, and the year on the input argument for the API has been manipulated, it is important to check for the return value of the function to make sure it succeeded.</p>
 <p>Otherwise, the function may have failed, and the output parameter may contain invalid data that can cause any number of problems on the affected system.</p>
-<p>The following is a list of the functions that this query covers:</p>
+<p>The following is a list of the functions that this query covers:
   <list>
-  <li><code>FileTimeToSystemTime</code></li>
-  <li><code>SystemTimeToFileTime</code></li>
-  <li><code>SystemTimeToTzSpecificLocalTime</code></li>
-  <li><code>SystemTimeToTzSpecificLocalTimeEx</code></li>
-  <li><code>TzSpecificLocalTimeToSystemTime</code></li>
-  <li><code>TzSpecificLocalTimeToSystemTimeEx</code></li>
-  <li><code>RtlLocalTimeToSystemTime</code></li>
-  <li><code>RtlTimeToSecondsSince1970</code></li>
-  <li><code>_mkgmtime</code></li>
-</list>
+    <li><code>FileTimeToSystemTime</code></li>
+    <li><code>SystemTimeToFileTime</code></li>
+    <li><code>SystemTimeToTzSpecificLocalTime</code></li>
+    <li><code>SystemTimeToTzSpecificLocalTimeEx</code></li>
+    <li><code>TzSpecificLocalTimeToSystemTime</code></li>
+    <li><code>TzSpecificLocalTimeToSystemTimeEx</code></li>
+    <li><code>RtlLocalTimeToSystemTime</code></li>
+    <li><code>RtlTimeToSecondsSince1970</code></li>
+    <li><code>_mkgmtime</code></li>
+  </list>
+</p>
 
 </overview>
 <recommendation>
@@ -34,6 +35,8 @@
 </example>
 
 <references>
-  <include src="LeapYearReferences.qhelp" />
+  <li>U.S. Naval Observatory Website - <a href="https://aa.usno.navy.mil/faq/docs/calendars.php"> Introduction to Calendars</a></li>
+  <li>Wikipedia - <a href="https://en.wikipedia.org/wiki/Leap_year_bug"> Leap year bug</a> </li>
+  <li>Microsoft Azure blog - <a href="https://azure.microsoft.com/en-us/blog/is-your-code-ready-for-the-leap-year/"> Is your code ready for the leap year?</a> </li>
 </references>
 </qhelp>
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.qhelp b/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.qhelp
index 21d65ad54c0..f1dc59d3731 100644
--- a/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.qhelp	
+++ b/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.qhelp	
@@ -23,6 +23,8 @@
 </example>
 
 <references>
-  <include src="LeapYearReferences.qhelp" />
+  <li>U.S. Naval Observatory Website - <a href="https://aa.usno.navy.mil/faq/docs/calendars.php"> Introduction to Calendars</a></li>
+  <li>Wikipedia - <a href="https://en.wikipedia.org/wiki/Leap_year_bug"> Leap year bug</a> </li>
+  <li>Microsoft Azure blog - <a href="https://azure.microsoft.com/en-us/blog/is-your-code-ready-for-the-leap-year/"> Is your code ready for the leap year?</a> </li>
 </references>
 </qhelp>