diff --git a/src/util/fmemopen.c b/src/util/fmemopen.c
index c77dba45ca5..921db98de31 100644
--- a/src/util/fmemopen.c
+++ b/src/util/fmemopen.c
@@ -69,7 +69,7 @@ Supporting OS subroutines required: <<sbrk>>.
 #include <errno.h>
 #include <string.h>
 #include <malloc.h>
-#include "stdioext.h"
+#include "extrastdio.h"
 
 /* Describe details of an open memstream.  */
 typedef struct fmemcookie {
diff --git a/src/util/fopencookie.c b/src/util/fopencookie.c
index dad0018a3c8..8b6d9d5ac87 100644
--- a/src/util/fopencookie.c
+++ b/src/util/fopencookie.c
@@ -86,7 +86,7 @@ Supporting OS subroutines required: <<sbrk>>.
 #include <stdio.h>
 #include <errno.h>
 #include <malloc.h>
-#include "stdioext.h"
+#include "extrastdio.h"
 
 typedef struct fccookie {
   void *cookie;
diff --git a/src/util/open_memstream.c b/src/util/open_memstream.c
index c298daa1f68..8b598a044ce 100644
--- a/src/util/open_memstream.c
+++ b/src/util/open_memstream.c
@@ -57,7 +57,7 @@ Supporting OS subroutines required: <<sbrk>>.
 #include <errno.h>
 #include <string.h>
 #include <malloc.h>
-#include "stdioext.h"
+#include "extrastdio.h"
 
 /* Describe details of an open memstream.  */
 typedef struct memstream {
diff --git a/src/util/stdioext.h b/src/util/stdioext.h
index 6c1bd416c47..620991811fd 100644
--- a/src/util/stdioext.h
+++ b/src/util/stdioext.h
@@ -1,9 +1,7 @@
-#ifndef  _STDIOEXT_H
-#define  _STDIOEXT_H
+#ifndef  LEPTONICA__STDIO_H
+#define  LEPTONICA__STDIO_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef  BUILD_HOST
 
 #include <stdio.h>
 #include <stdint.h>
@@ -21,8 +19,6 @@ FILE *fmemopen(void *buf, size_t size, const char *mode);
 
 FILE *open_memstream(char **buf, size_t *size);
 
-#ifdef __cplusplus
-} // extern "C"
 #endif
 
-#endif  /* _STDIOEXT_H */
+#endif  /* LEPTONICA__STDIO_H */