diff --git a/src/utf.h b/src/utf.h
index e2d6c59..862c548 100644
--- a/src/utf.h
+++ b/src/utf.h
@@ -10,18 +10,23 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #ifdef HAVE_INTTYPES_H
 /* inttypes.h includes stdint.h in a standard environment, so there's
 no need to include stdint.h separately. If inttypes.h doesn't define
 int32_t, it's defined in config.h. */
 #include <inttypes.h>
-#else
+#endif /* HAVE_INTTYPES_H */
+
+#else /* !HAVE_CONFIG_H */
 #ifdef _WIN32
 typedef int int32_t;
-#endif
-#endif
+#else /* !_WIN32 */
+/* Assume a standard environment */
+#include <inttypes.h>
+#endif /* _WIN32 */
+
+#endif /* HAVE_CONFIG_H */
 
 int utf8_encode(int codepoint, char *buffer, int *size);