diff --git a/src/config_h/.cvsignore b/src/config_h/.cvsignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/help.cpp b/src/help.cpp
index 38a176f6..06043d7b 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -50,9 +50,9 @@ void show_head(void)
                 "                     Ultimate Packer for eXecutables\n"
                 "      Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003\n"
                 "UPX %-12s Markus F.X.J. Oberhumer & Laszlo Molnar %20s\n\n",
-#if defined(__MFX_DOS)
+#if (ACC_OS_DOS16 || ACC_OS_DOS32)
                 V("d"),
-#elif defined(__MFX_WIN32)
+#elif (ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
                 V("w"),
 #elif 0 && defined(__linux__)
                 V("l"),
diff --git a/src/main.cpp b/src/main.cpp
index 42aa1706..33fe9f5a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,7 +56,7 @@ void init_options(struct options_t *o)
     o->overlay = -1;
 
     o->console = CON_FILE;
-#if defined(__MFX_DOS) || defined(__MFX_WIN)
+#if (ACC_OS_DOS32 || ACC_OS_WIN32)
     o->console = CON_INIT;
 #elif 1 && defined(__linux__)
     o->console = CON_INIT;
@@ -1142,7 +1142,7 @@ int main(int argc, char *argv[])
     if (!argv[0] || !argv[0][0])
         argv[0] = default_argv0;
     argv0 = argv[0];
-#if defined(DOSISH)
+#if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_TOS || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
     {
         char *prog = fn_basename(argv0);
         char *p;