diff --git a/src/backend/xml/test/test-file-stuff.cpp b/src/backend/xml/test/test-file-stuff.cpp
index a6bbf80243..8e99a07946 100644
--- a/src/backend/xml/test/test-file-stuff.cpp
+++ b/src/backend/xml/test/test-file-stuff.cpp
@@ -383,7 +383,7 @@ test_files_in_dir (int argc, char** argv, gxpf_callback cb,
 
     for (count = 1; count < argc; count++)
     {
-        struct stat file_info;
+        GStatBuf file_info;
         const char* to_open = argv[count];
         if (g_stat (to_open, &file_info) != 0)
         {
diff --git a/src/backend/xml/test/test-load-xml2.cpp b/src/backend/xml/test/test-load-xml2.cpp
index 3df9861c11..9d0ce80266 100644
--- a/src/backend/xml/test/test-load-xml2.cpp
+++ b/src/backend/xml/test/test-load-xml2.cpp
@@ -31,6 +31,8 @@ extern "C"
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <string.h>
@@ -62,7 +64,7 @@ remove_files_pattern (const char* begining, const char* ending)
 static void
 remove_locks (const char* filename)
 {
-    struct stat buf;
+    GStatBuf buf;
     char* to_remove;
 
     {