diff --git a/ase/macros.h b/ase/macros.h
index 15689f9c..1084fee9 100644
--- a/ase/macros.h
+++ b/ase/macros.h
@@ -1,5 +1,5 @@
 /*
- * $Id: macros.h,v 1.12 2005-03-29 07:29:13 bacon Exp $
+ * $Id: macros.h,v 1.13 2005-03-29 11:37:50 bacon Exp $
  */
 
 #ifndef _XP_MACROS_H_
@@ -18,8 +18,8 @@
 #define xp_sizeof(n)   (sizeof(n))
 #define xp_countof(n)  (sizeof(n) / sizeof(n[0]))
 
-#if defined(_WIN32)
-    #define xp_main _tmain
+#if defined(_WIN32) && defined(XP_CHAR_IS_WCHAR)
+    #define xp_main wmain
 #elif defined(XP_CHAR_IS_MCHAR)
     #define xp_main main
 #endif
diff --git a/ase/types.h b/ase/types.h
index d05b552e..da3350ab 100644
--- a/ase/types.h
+++ b/ase/types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: types.h,v 1.17 2005-03-29 10:09:27 bacon Exp $
+ * $Id: types.h,v 1.18 2005-03-29 11:37:50 bacon Exp $
  */
 
 #ifndef _XP_TYPES_H_
@@ -144,4 +144,8 @@ typedef xp_mcint_t  xp_cint_t;
 typedef xp_wchar_t  xp_char_t;
 typedef xp_wcint_t  xp_cint_t;
 
+#if defined(_WIN32) && defined(XP_CHAR_IS_WCHAR)
+	#define UNICODE
+#endif
+
 #endif