diff --git a/golded3/gcarea.cpp b/golded3/gcarea.cpp
index e3b6f8e..e233dbd 100644
--- a/golded3/gcarea.cpp
+++ b/golded3/gcarea.cpp
@@ -73,7 +73,7 @@ void RenameArea(char* echoid)
 {
   std::vector<EchoRen>::iterator n = CFG->arearename.begin();
   std::vector<EchoRen>::iterator end = CFG->arearename.end();
-  
+
   for (; n != end; n++)
   {
     if (strieql(echoid, n->from.c_str()))
@@ -626,11 +626,11 @@ void AreaList::GetArea(char* def) {
 //  Get area definition (new)
 //
 //  Syntax of AREADEF keyword:
-//  
+//
 //    AREADEF <echoid> <"desc"> <group> <type> <msgbase> <path/board> <aka> <(attrs)> ["origin"]
-//  
+//
 //  Examples:
-//  
+//
 //    AREADEF NET.ALL  "Netmail, Line 1" N Net   Opus   R:\NETMAIL\             2:231/77 (PVT K/S)
 //    AREADEF TEST     "Testing..."      D Echo  Hudson 67                      .        ()
 //    AREADEF 1LOCAL   "Sysop <-> Users" L Local Squish R:\MAX\MSG\LOC\1LOCAL   .        (PVT)     "Your Sysop * The Goldware BBS Line 1"
@@ -1077,8 +1077,8 @@ char* MapPath(char* map, bool reverse)
 
   std::vector< std::pair<std::string, std::string> >::iterator i = CFG->mappath.begin();
   std::vector< std::pair<std::string, std::string> >::iterator end = CFG->mappath.end();
-  
-  for (i; i != end; i++)
+
+  for (; i != end; i++)
   {
     const char* p = reverse ? i->second.c_str() : i->first.c_str();
     const char* q = reverse ? i->first.c_str() : i->second.c_str();
@@ -1139,4 +1139,3 @@ const char* AreaCfg::setautoid(const char* _echoid) {
 
 
 //  ------------------------------------------------------------------
-
diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp
index 58ad7bc..a2ceaec 100644
--- a/golded3/gccfgg.cpp
+++ b/golded3/gccfgg.cpp
@@ -471,7 +471,7 @@ int InstallFinish()
       aa.setpath(buf);
       aa.attr = CFG->attribsnet;
       AL.AddNewArea(&aa);
-      fp.Printf("AREADEF %s \"%s\" 0 Net %s %s\n", aa.desc, aa.echoid, aa.basetype, buf);
+      fp.Printf("AREADEF %s \"%s\" 0 Net %s %s\n", aa.desc, aa.echoid, aa.basetype.c_str(), buf);
       if (EnterString("Please enter the path *and* filename of your areas.bbs file:", buf, sizeof(buf)))
         return -1;
       fp.Printf("AREAFILE AreasBBS %s\n", buf);
diff --git a/golded3/geread2.cpp b/golded3/geread2.cpp
index 3d97223..e26a4a5 100644
--- a/golded3/geread2.cpp
+++ b/golded3/geread2.cpp
@@ -664,7 +664,7 @@ void ExternUtilMenu(GMsg* msg)
   for (; it != end; it++)
   {
     char buf[100];
-    sprintf(buf, " %02d %.59s%s ", it->utilno, it->cmdline, (it->cmdline.length() > 59) ? ">" : "" );
+    sprintf(buf, " %02d %.59s%s ", it->utilno, it->cmdline.c_str(), (it->cmdline.length() > 59) ? ">" : "" );
     Listi.push_back(buf);
   }
 
diff --git a/goldlib/gcfg/Makefile b/goldlib/gcfg/Makefile
index c3b9436..c39d517 100644
--- a/goldlib/gcfg/Makefile
+++ b/goldlib/gcfg/Makefile
@@ -1,8 +1,23 @@
 # -*- makefile -*-
 
+ifeq ($(TERM),cygwin)
+MINGW=true
+else
+ifeq ($(OSTYPE),msys)
+MINGW=true
+endif
+endif
+
 TOP=../..
 TARGET=gcfg
 INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg
+ifdef MINGW
+INCS+=-I$(TOP)/goldlib/glibc
+else
+ifeq ($(findstring EMX, $(PATH)), EMX)
+INCS+=-I$(TOP)/goldlib/glibc
+endif
+endif
 
 include $(TOP)/GNUmakef.inc
 include $(TOP)/GNUmakef.lib
diff --git a/goldlib/gmb3/Makefile b/goldlib/gmb3/Makefile
index 91a1a08..3fdce72 100644
--- a/goldlib/gmb3/Makefile
+++ b/goldlib/gmb3/Makefile
@@ -1,8 +1,23 @@
 # -*- makefile -*-
 
+ifeq ($(TERM),cygwin)
+MINGW=true
+else
+ifeq ($(OSTYPE),msys)
+MINGW=true
+endif
+endif
+
 TOP=../..
 TARGET=gmb3
 INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/smblib
+ifdef MINGW
+INCS+=-I$(TOP)/goldlib/glibc
+else
+ifeq ($(findstring EMX, $(PATH)), EMX)
+INCS+=-I$(TOP)/goldlib/glibc
+endif
+endif
 
 include $(TOP)/GNUmakef.inc
 ifeq ($(PLATFORM),emx)