Removed inclusion of wine/winestring.h from winbase.h and added it to
the C files that need it.

diff --git a/memory/environ.c b/memory/environ.c
index 7353b95..380c8d8 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -95,7 +95,7 @@
 {
     while (*env)
     {
-        if (!lstrncmpiA( name, env, len ) && (env[len] == '='))
+        if (!strncasecmp( name, env, len ) && (env[len] == '='))
             return env + len + 1;
         env += strlen(env) + 1;
     }
@@ -284,7 +284,7 @@
     len = strlen(name);
     while (*p)
     {
-        if (!lstrncmpiA( name, p, len ) && (p[len] == '=')) break;
+        if (!strncasecmp( name, p, len ) && (p[len] == '=')) break;
         p += strlen(p) + 1;
     }
     if (!value && !*p) goto done;  /* Value to remove doesn't exist */