diff --git a/include/grass/gis.h b/include/grass/gis.h
index 3364ba2f908..725df0940f8 100644
--- a/include/grass/gis.h
+++ b/include/grass/gis.h
@@ -136,7 +136,7 @@ static const char *GRASS_copyright UNUSED = "GRASS GNU GPL licensed Software";
 #define WKT_FILE         "PROJ_WKT"
 #define SRID_FILE        "PROJ_SRID"
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #define CONFIG_DIR "GRASS8"
 #else
 #define CONFIG_DIR ".grass8"
diff --git a/lib/db/dbmi_base/dirent.c b/lib/db/dbmi_base/dirent.c
index b306e13c4d7..09bdc257c2e 100644
--- a/lib/db/dbmi_base/dirent.c
+++ b/lib/db/dbmi_base/dirent.c
@@ -21,8 +21,8 @@
 #include <grass/dbmi.h>
 
 /* NOTE: these should come from <unistd.h> or from <sys/file.h> */
-#ifndef R_OK
 #if !defined(HAVE_UNISTD_H)
+#ifndef R_OK
 #define R_OK 4
 #endif
 #ifndef W_OK