diff --git a/src/blowfish.c b/src/blowfish.c
index 1070887..ee64db6 100644
--- a/src/blowfish.c
+++ b/src/blowfish.c
@@ -41,7 +41,7 @@
 static int bf_check_tables __ARGS((uint32_t ipa[18], uint32_t sbi[4][256], uint32_t val));
 static int bf_self_test __ARGS((void));
 
-// Blowfish code
+/* Blowfish code */
 static uint32_t pax[18];
 static uint32_t ipa[18] = {
     0x243f6a88u, 0x85a308d3u, 0x13198a2eu,
@@ -470,8 +470,10 @@
     uint32_t keysum;
 } struct_bf_test_data;
 
-// Assert bf(password, plaintxt) is cryptxt.
-// Assert csum(pax sbx(password)) is keysum.
+/*
+ * Assert bf(password, plaintxt) is cryptxt.
+ * Assert csum(pax sbx(password)) is keysum.
+ */
 static struct_bf_test_data bf_test_data[] = {
   {
       "password",
diff --git a/src/vim.h b/src/vim.h
index 1264a84..fb999b2 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1980,6 +1980,12 @@
 
 #endif
 
+#if !defined(HAVE_CONFIG_H) && !defined(uint32_t) \
+	&& (defined(__CYGWIN32__) || defined(__MINGW32__))
+  /* Assuming that MingW and Cygwin do not typedef uint32_t. */
+# define uint32_t unsigned int
+#endif
+
 /* ISSYMLINK(mode) tests if a file is a symbolic link. */
 #if (defined(S_IFMT) && defined(S_IFLNK)) || defined(S_ISLNK)
 # define HAVE_ISSYMLINK
@@ -2067,9 +2073,9 @@
 
 /* uint32_t may be defined by configure, but perh.h may indirectly include
  * stdint.h which tries to typedef uint32_t and fails. */
-#ifdef uint32_t
-# undef uint32_t
-#endif
+# ifdef uint32_t
+#  undef uint32_t
+# endif
 
 # ifdef __BORLANDC__
   /* Borland has the structure stati64 but not _stati64 */