diff --git a/file_io/os2/open.c b/file_io/os2/open.c
index 1a5932e..be28439 100644
--- a/file_io/os2/open.c
+++ b/file_io/os2/open.c
@@ -95,7 +95,9 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname,
     ULONG    CurMaxFH      = 0;          /* Current count of handles         */
     LONG     ReqCount      = 0;          /* Number to adjust file handles    */
 
-    apr_file_t *dafile = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
+    // 2019-06-03 SHL ensure initialized to zeros
+    // apr_file_t *dafile = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
+    apr_file_t *dafile = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
 
     if (flag & APR_FOPEN_NONBLOCK) {
         return APR_ENOTIMPL;
@@ -265,7 +267,9 @@ APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, apr_os_file_t *thef
 {
     apr_os_file_t *dafile = thefile;
 
-    (*file) = apr_palloc(pool, sizeof(apr_file_t));
+    // 2019-06-03 SHL ensure initialized to zeros
+    // (*file) = apr_palloc(pool, sizeof(apr_file_t));
+    (*file) = apr_pcalloc(pool, sizeof(apr_file_t));
     (*file)->pool = pool;
     (*file)->filedes = *dafile;
     (*file)->isopen = TRUE;

diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c
index 26925f0..868f561 100644
--- a/file_io/os2/pipe.c
+++ b/file_io/os2/pipe.c
@@ -69,7 +69,9 @@ static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
         return APR_FROM_OS_ERROR(rc);
     }
 
-    (*in) = (apr_file_t *)apr_palloc(pool_in, sizeof(apr_file_t));
+    // 2019-06-03 SHL Ensure apr_file_t initialized to zeros
+    // (*in) = (apr_file_t *)apr_palloc(pool_in, sizeof(apr_file_t));
+    (*in) = (apr_file_t *)apr_pcalloc(pool_in, sizeof(apr_file_t));
     rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, FALSE);
 
     if (rc) {
@@ -96,7 +98,6 @@ static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
     (*in)->fname = apr_pstrdup(pool_in, pipename);
     (*in)->isopen = TRUE;
     (*in)->buffered = FALSE;
-    (*in)->flags = 0;
     (*in)->pipe = 1;
     (*in)->timeout = -1;
     (*in)->ungetchar = -1;
@@ -104,13 +105,14 @@ static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
     apr_pool_cleanup_register(pool_in, *in, apr_file_cleanup,
             apr_pool_cleanup_null);
 
-    (*out) = (apr_file_t *)apr_palloc(pool_out, sizeof(apr_file_t));
+    // 2019-06-03 SHL Ensure apr_file_t initialized to zeros
+    // (*out) = (apr_file_t *)apr_palloc(pool_out, sizeof(apr_file_t));
+    (*out) = (apr_file_t *)apr_pcalloc(pool_out, sizeof(apr_file_t));
     (*out)->pool = pool_out;
     (*out)->filedes = filedes[1];
     (*out)->fname = apr_pstrdup(pool_out, pipename);
     (*out)->isopen = TRUE;
     (*out)->buffered = FALSE;
-    (*out)->flags = 0;
     (*out)->pipe = 2;			// 2014-11-17 SHL mark as client pipe
     (*out)->ungetchar = -1;
     (*out)->timeout = -1;