diff --git a/library/entropy_poll.c b/library/entropy_poll.c
index 1e465af768..f11a0b8229 100644
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@@ -52,9 +52,10 @@
 #if _WIN32_WINNT >= 0x0501 /* _WIN32_WINNT_WINXP */
 #include <bcrypt.h>
 #if defined(_MSC_VER) && _MSC_VER <= 1600
-/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and <intsafe.h> are included, as they
- * redefine a number of <TYPE>_MAX constants. These constants are guaranteed to be the same, though, so
- * we suppress the warning when including intsafe.h.
+/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and
+ * <intsafe.h> are included, as they redefine a number of <TYPE>_MAX constants.
+ * These constants are guaranteed to be the same, though, so we suppress the
+ * warning when including intsafe.h.
  */
 #pragma warning( push )
 #pragma warning( disable : 4005 )
@@ -72,8 +73,9 @@ int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
     *olen = 0;
 
     /*
-     * BCryptGenRandom takes ULONG for size, which is smaller than size_t on 64-bit platforms.
-     * Ensure len's value can be safely converted into a ULONG.
+     * BCryptGenRandom takes ULONG for size, which is smaller than size_t on
+     * 64-bit Windows platforms. Ensure len's value can be safely converted into
+     * a ULONG.
      */
     if ( FAILED( SizeTToULong( len, &len_as_ulong ) ) )
     {
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 8fc8a5273b..f73e215c26 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -62,9 +62,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #if defined(_MSC_VER) && _MSC_VER <= 1600
-/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and <intsafe.h> are included, as they
- * redefine a number of <TYPE>_MAX constants. These constants are guaranteed to be the same, though, so
- * we suppress the warning when including intsafe.h.
+/* Visual Studio 2010 and earlier issue a warning when both <stdint.h> and
+ * <intsafe.h> are included, as they redefine a number of <TYPE>_MAX constants.
+ * These constants are guaranteed to be the same, though, so we suppress the
+ * warning when including intsafe.h.
  */
 #pragma warning( push )
 #pragma warning( disable : 4005 )