diff --git a/common.cpp b/common.cpp
index e40efc1c6..f3d115c7d 100644
--- a/common.cpp
+++ b/common.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: common.cpp,v 1.6 2003/03/13 09:31:36 mosu Exp $
+    \version \$Id: common.cpp,v 1.7 2003/04/11 10:05:11 mosu Exp $
     \brief helper functions, common variables
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -177,19 +177,19 @@ track_info_t *duplicate_track_info(track_info_t *src) {
     if (dst->fname == NULL)
       die("strdup");
   }
-  if (src->astreams != NULL) {
-    dst->astreams = (unsigned char *)strdup((char *)src->astreams);
-    if (dst->astreams == NULL)
+  if (src->atracks != NULL) {
+    dst->atracks = (unsigned char *)strdup((char *)src->atracks);
+    if (dst->atracks == NULL)
       die("strdup");
   }
-  if (src->vstreams != NULL) {
-    dst->vstreams = (unsigned char *)strdup((char *)src->vstreams);
-    if (dst->vstreams == NULL)
+  if (src->vtracks != NULL) {
+    dst->vtracks = (unsigned char *)strdup((char *)src->vtracks);
+    if (dst->vtracks == NULL)
       die("strdup");
   }
-  if (src->tstreams != NULL) {
-    dst->tstreams = (unsigned char *)strdup((char *)src->tstreams);
-    if (dst->tstreams == NULL)
+  if (src->stracks != NULL) {
+    dst->stracks = (unsigned char *)strdup((char *)src->stracks);
+    if (dst->stracks == NULL)
       die("strdup");
   }
   if (src->private_data != NULL) {
@@ -208,12 +208,12 @@ void free_track_info(track_info_t *ti) {
 
   if (ti->fname != NULL)
     free(ti->fname);
-  if (ti->astreams != NULL)
-    free(ti->astreams);
-  if (ti->vstreams != NULL)
-    free(ti->vstreams);
-  if (ti->tstreams != NULL)
-    free(ti->tstreams);
+  if (ti->atracks != NULL)
+    free(ti->atracks);
+  if (ti->vtracks != NULL)
+    free(ti->vtracks);
+  if (ti->stracks != NULL)
+    free(ti->stracks);
   if (ti->private_data != NULL)
     free(ti->private_data);
 
diff --git a/common.h b/common.h
index 8d4d6c0a7..c6f61eac0 100644
--- a/common.h
+++ b/common.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: common.h,v 1.9 2003/03/13 09:31:06 mosu Exp $
+    \version \$Id: common.h,v 1.10 2003/04/11 10:05:11 mosu Exp $
     \brief definitions used in all programs, helper functions
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -23,6 +23,16 @@
 
 #include <sys/types.h>
 
+#ifdef WIN32
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#define u_int16_t unsigned __int16
+#define u_int32_t unsigned __int32
+#define u_int64_t __int64
+#define int64_t __int64
+#define nice(a)
+#endif
+
 #include "config.h"
 
 #define VERSIONINFO "mkvmerge v" VERSION
@@ -63,7 +73,7 @@ typedef struct {
 typedef struct {
   // Options used by the readers.
   char *fname;
-  unsigned char *astreams, *vstreams, *tstreams;
+  unsigned char *atracks, *vtracks, *stracks;
 
   // Options used by the packetizers.
   unsigned char *private_data;