diff --git a/Config.def b/Config.def
index 0df1a87..7ae369a 100644
--- a/Config.def
+++ b/Config.def
@@ -70,5 +70,5 @@
 #CPPFLAGS+=-DGCFG_NOWMAIL
 # Uncomment to disable xMail support
 #CPPFLAGS+=-DGCFG_NOXMAIL
-# Uncomment to disable SBBS support
-#CPPFLAGS+=-DGCFG_NOSBBS
+# Uncomment to disable Synchronet BBS support
+#CPPFLAGS+=-DGCFG_NOSYNCHRONET
diff --git a/goldlib/gall/gctype.h b/goldlib/gall/gctype.h
index b1db555..ba9e9ad 100644
--- a/goldlib/gall/gctype.h
+++ b/goldlib/gall/gctype.h
@@ -43,12 +43,6 @@
 #include <ctype.h>
 #if defined(__EMX__)
 #include <sys/nls.h>
-#ifdef __cplusplus
-extern "C" {
-__inline__ int tolower(int c) { return _nls_tolower((unsigned char)(c)); }
-__inline__ int toupper(int c) { return _nls_toupper((unsigned char)(c)); }
-}
-#else
 #define tolower(c) _nls_tolower((unsigned char)(c))
 #define toupper(c) _nls_toupper((unsigned char)(c))
 #endif
diff --git a/goldlib/gcfg/gedacfg.h b/goldlib/gcfg/gedacfg.h
index 71f8651..debd9e8 100644
--- a/goldlib/gcfg/gedacfg.h
+++ b/goldlib/gcfg/gedacfg.h
@@ -439,7 +439,7 @@ public:
 #ifndef GCFG_NOXMAIL
   void ReadXMail(char* tag);
 #endif
-#ifndef GCFG_NOSBBS
+#ifndef GCFG_NOSYNCHRONET
   void ReadSynchronet(char* tag);
 #endif
 
diff --git a/goldlib/gcfg/gxsync.cpp b/goldlib/gcfg/gxsync.cpp
index e98335c..5bafd49 100644
--- a/goldlib/gcfg/gxsync.cpp
+++ b/goldlib/gcfg/gxsync.cpp
@@ -27,7 +27,7 @@
 #include <cstdlib>
 #include <gcrcall.h>
 #include <gstrall.h>
-#undef GCFG_NOCMAIL
+#undef GCFG_NOSYNCHRONET
 #include <gedacfg.h>
 #include <gs_sync.h>