diff --git a/src/acc/acc.h b/src/acc/acc.h
index 75581521..848cd9ca 100644
--- a/src/acc/acc.h
+++ b/src/acc/acc.h
@@ -22,7 +22,7 @@
  */
 
 
-#define ACC_VERSION     20030401L
+#define ACC_VERSION     20030405L
 
 #if !defined(ACC_CONFIG_INCLUDE)
 #  define ACC_CONFIG_INCLUDE(file)     file
diff --git a/src/acc/acc_arch.h b/src/acc/acc_arch.h
index 764a8963..93571e83 100644
--- a/src/acc/acc_arch.h
+++ b/src/acc/acc_arch.h
@@ -33,24 +33,16 @@
 #if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
 #  define ACC_ARCH_IA16             1
 #  define ACC_INFO_ARCH             "ia16"
+#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86)
+#  define ACC_ARCH_IA32             1
+#  define ACC_INFO_ARCH             "ia32"
+#elif defined(__ia64__) || defined(_M_IA64)
+#  define ACC_ARCH_IA64             1
+#  define ACC_INFO_ARCH             "ia64"
 #elif (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32)
-#  if defined(_MSC_VER) && !defined(_M_IX86)
-#    error "unexpected CPU architechture"
-#  endif
-#  define ACC_ARCH_IA32             1
-#  define ACC_INFO_ARCH             "ia32"
+#  error "missing define for CPU architechture"
 #elif (ACC_OS_WIN64)
-#  if defined(_MSC_VER) && !defined(_M_IA64)
-#    error "unexpected CPU architechture"
-#  endif
-#  define ACC_ARCH_IA64             1
-#  define ACC_INFO_ARCH             "ia64"
-#elif defined(__386__) || defined(__i386__) || defined(__i386)
-#  define ACC_ARCH_IA32             1
-#  define ACC_INFO_ARCH             "ia32"
-#elif defined(__ia64__)
-#  define ACC_ARCH_IA64             1
-#  define ACC_INFO_ARCH             "ia64"
+#  error "missing define for CPU architechture"
 #elif (ACC_OS_TOS) || defined(__m68000__)
 #  define ACC_ARCH_M68K             1
 #  define ACC_INFO_ARCH             "m68k"
diff --git a/src/acc/acc_auto.h b/src/acc/acc_auto.h
index 36f99c16..2564aaf4 100644
--- a/src/acc/acc_auto.h
+++ b/src/acc/acc_auto.h
@@ -20,6 +20,7 @@
 #define STDC_HEADERS 1
 
 #define HAVE_CONIO_H 1
+#define HAVE_CTYPE_H 1
 #define HAVE_DOS_H 1
 #define HAVE_ERRNO_H 1
 #define HAVE_FCNTL_H 1
@@ -41,6 +42,7 @@
 #define HAVE_SYS_UTIME_H 1
 #define HAVE_SYS_TYPES_H 1
 
+#undef HAVE_STDINT_H
 #undef HAVE_STRINGS_H
 
 
@@ -103,7 +105,7 @@
 #  undef HAVE_SYS_TIME_H
 #  undef HAVE_SYS_TYPES_H
 #  undef HAVE_SYS_UTIME_H
-#elif (ACC_CC_PUREC && ACC_OS_TOS)
+#elif ((ACC_CC_PUREC || ACC_CC_TURBOC) && ACC_OS_TOS)
 #  undef HAVE_CONIO_H
 #  undef HAVE_DOS_H
 #  undef HAVE_FCNTL_H
@@ -142,12 +144,16 @@
 // Checks for <stdint.h>
 **************************************************************************/
 
-#if (ACC_CC_DMC) && defined(__DMC_VERSION_STRING__)
-#  define HAVE_STDINT_H 1
-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 #  if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
 #    define HAVE_STDINT_H 1
 #  endif
+#elif defined(__dietlibc__)
+#  undef HAVE_STDINT_H /* incomplete */
+#elif (ACC_CC_BORLANDC) && (__BORLANDC__ >= 0x560)
+#  define HAVE_STDINT_H 1
+#elif (ACC_CC_DMC) && (__DMC__ >= 0x825)
+#  define HAVE_STDINT_H 1
 #endif
 
 #if HAVE_STDINT_H
@@ -159,9 +165,6 @@
 // Checks for typedefs and structures
 **************************************************************************/
 
-/* FIXME - types ??? */
-#define HAVE_MODE_T 1
-
 #define SIZEOF_SHORT            (__ACC_SHORT_BIT / 8)
 #define SIZEOF_INT              (__ACC_INT_BIT / 8)
 #define SIZEOF_LONG             (__ACC_LONG_BIT / 8)
@@ -300,7 +303,7 @@
 #  undef HAVE_STRFTIME
 #  undef HAVE_UTIME
 #  undef HAVE_VSNPRINTF
-#elif (ACC_CC_PUREC && ACC_OS_TOS)
+#elif ((ACC_CC_PUREC || ACC_CC_TURBOC) && ACC_OS_TOS)
 #  undef HAVE_ACCESS
 #  undef HAVE_CHMOD
 #  undef HAVE_CHOWN
@@ -313,7 +316,7 @@
 #  undef HAVE_UMASK
 #  undef HAVE_UTIME
 #  undef HAVE_VSNPRINTF
-#elif (ACC_CC_TURBOC && ACC_OS_DOS16)
+#elif (ACC_CC_TURBOC && (ACC_OS_DOS16 || ACC_OS_WIN16))
 #  undef HAVE_SNPRINTF
 #  undef HAVE_VSNPRINTF
 #  if (__TURBOC__ < 0x0295)
diff --git a/src/acc/acc_init.h b/src/acc/acc_init.h
index e3e660c1..971b6e24 100644
--- a/src/acc/acc_init.h
+++ b/src/acc/acc_init.h
@@ -32,6 +32,11 @@
 // fix incorrect and missing stuff
 ************************************************************************/
 
+#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
+#  define __CYGWIN__ __CYGWIN32__
+#endif
+
+
 /* Microsoft C does not correctly define ptrdiff_t for
  * the 16-bit huge memory model.
  */
@@ -69,7 +74,7 @@
 #endif
 
 
-#if defined(__TOS__) && defined(__PUREC__)
+#if defined(__TOS__) && (defined(__PUREC__) || defined(__TURBOC__))
 #  define ACC_BROKEN_SIZEOF 1
 #endif
 
diff --git a/src/acc/acc_mm.h b/src/acc/acc_mm.h
index 1fbeb9a0..e7476bde 100644
--- a/src/acc/acc_mm.h
+++ b/src/acc/acc_mm.h
@@ -30,22 +30,22 @@
 #if (UINT_MAX != 0xffffL)
 #  error "this should not happen"
 #endif
-#if defined(__TINY__) || defined(M_I86TM)
+#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM)
 #  define ACC_MM_TINY           1
 #  define ACC_INFO_MM           "tiny"
-#elif defined(__SMALL__) || defined(M_I86SM) || defined(SMALL_MODEL)
-#  define ACC_MM_SMALL          1
-#  define ACC_INFO_MM           "small"
-#elif defined(__MEDIUM__) || defined(M_I86MM)
-#  define ACC_MM_MEDIUM         1
-#  define ACC_INFO_MM           "medium"
-#elif defined(__COMPACT__) || defined(M_I86CM)
-#  define ACC_MM_COMPACT        1
-#  define ACC_INFO_MM           "compact"
-#elif defined(__HUGE__) || defined(M_I86HM)
+#elif defined(__HUGE__) || defined(M_I86HM) || defined(_M_I86HM)
 #  define ACC_MM_HUGE           1
 #  define ACC_INFO_MM           "huge"
-#elif defined(__LARGE__) || defined(M_I86LM) || defined(LARGE_MODEL)
+#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL)
+#  define ACC_MM_SMALL          1
+#  define ACC_INFO_MM           "small"
+#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM)
+#  define ACC_MM_MEDIUM         1
+#  define ACC_INFO_MM           "medium"
+#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM)
+#  define ACC_MM_COMPACT        1
+#  define ACC_INFO_MM           "compact"
+#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL)
 #  define ACC_MM_LARGE          1
 #  define ACC_INFO_MM           "large"
 #else
diff --git a/src/acc/acc_os.h b/src/acc/acc_os.h
index 855c7b2e..408fd9bf 100644
--- a/src/acc/acc_os.h
+++ b/src/acc/acc_os.h
@@ -36,10 +36,6 @@
  */
 
 
-#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
-#  define __CYGWIN__ __CYGWIN32__
-#endif
-
 #if defined(__CYGWIN__) && defined(__GNUC__)
 #  define ACC_OS_CYGWIN         1
 #  define ACC_INFO_OS           "cygwin"
@@ -68,7 +64,7 @@
 #  else
 #    error "check your limits.h header"
 #  endif
-#elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS) || (defined(__PACIFIC__) && defined(DOS))
+#elif defined(__DOS__) || defined(__MSDOS__) || defined(_MSDOS) || defined(MSDOS) || (defined(__PACIFIC__) && defined(DOS))
 #  if (UINT_MAX == 0xffffffffL)
 #    define ACC_OS_DOS32        1
 #    define ACC_INFO_OS         "dos32"
@@ -158,12 +154,12 @@
 
 #if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
 #  if (UINT_MAX != 0xffffL)
-#    error
+#    error "this should not happen"
 #  endif
 #endif
 #if (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32 || ACC_OS_WIN64)
 #  if (UINT_MAX != 0xffffffffL)
-#    error
+#    error "this should not happen"
 #  endif
 #endif