diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c
index 4744023e12..9f6d40e0b8 100644
--- a/app/core/gimp-utils.c
+++ b/app/core/gimp-utils.c
@@ -165,17 +165,17 @@ gimp_get_default_language (const gchar *category)
 
 #ifdef G_OS_WIN32
 
-  p = getenv ("LC_ALL");
+  p = (gchar *) g_getenv ("LC_ALL");
   if (p != NULL)
     lang = g_strdup (p);
   else
     {
-      p = getenv ("LANG");
+      p = (gchar *) g_getenv ("LANG");
       if (p != NULL)
         lang = g_strdup (p);
       else
         {
-          p = getenv (category);
+          p = (gchar *) g_getenv (category);
           if (p != NULL)
             lang = g_strdup (p);
           else
diff --git a/tools/gimptool.c b/tools/gimptool.c
index 2b03ac0e2d..fdce69f33e 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -110,7 +110,7 @@ static const gchar *
 win32_command (const gchar *command)
 {
   static gchar *cmd     = NULL;
-  const gchar  *comspec = getenv ("COMSPEC");
+  const gchar  *comspec = g_getenv ("COMSPEC");
 
   if (comspec == NULL)
     comspec = "cmd.exe";
@@ -292,7 +292,7 @@ find_out_env_flags (void)
 {
   gchar *p;
 
-  if ((p = getenv ("CC")) != NULL && *p != '\0')
+  if ((p = (gchar *) g_getenv ("CC")) != NULL && *p != '\0')
     env_cc = p;
   else if (msvc_syntax)
     env_cc = "cl -MD";
@@ -303,17 +303,17 @@ find_out_env_flags (void)
       g_ascii_strncasecmp (env_cc, "clang", 5) != 0)
     msvc_syntax = TRUE;
 
-  if ((p = getenv ("CFLAGS")) != NULL)
+  if ((p = (gchar *) g_getenv ("CFLAGS")) != NULL)
     env_cflags = p;
   else
     env_cflags = "";
 
-  if ((p = getenv ("LDFLAGS")) != NULL)
+  if ((p = (gchar *) g_getenv ("LDFLAGS")) != NULL)
     env_ldflags = p;
   else
     env_ldflags = "";
 
-  if ((p = getenv ("LIBS")) != NULL && *p != '\0')
+  if ((p = (gchar *) g_getenv ("LIBS")) != NULL && *p != '\0')
     env_libs = p;
   else
     env_libs = "";