diff --git a/widget/src/os2/nsGfxDefs.h b/widget/src/os2/nsGfxDefs.h
index 541e197348f4..3788104c0a10 100644
--- a/widget/src/os2/nsGfxDefs.h
+++ b/widget/src/os2/nsGfxDefs.h
@@ -74,30 +74,12 @@ class nsIDeviceContext;
 
 struct nsUconvInfo
 {
-  char*    mCharset;
   PRUint16 mCodePage;
   UconvObject  mConverter;
+  nsUconvInfo* pNext;
 };
 
-static nsUconvInfo gUconvInfo[15  /* eCharSet_COUNT from nsFontMetricsOS2.cpp */ ] = 
-{
-  { "DEFAULT",     0,    NULL },
-  { "ANSI",        1252, NULL },
-  { "EASTEUROPE",  1250, NULL },
-  { "RUSSIAN",     1251, NULL },
-  { "GREEK",       1253, NULL },
-  { "TURKISH",     1254, NULL },
-  { "HEBREW",      862,  NULL },
-  { "ARABIC",      864,  NULL },
-  { "BALTIC",      1257, NULL },
-  { "THAI",        874,  NULL },
-  { "SHIFTJIS",    932,  NULL },
-  { "GB2312",      936,  NULL },
-  { "HANGEUL",     949,  NULL },
-  { "CHINESEBIG5", 950,  NULL },
-  { "JOHAB",       1361, NULL }
-};
-
+static nsUconvInfo* gUconvInfoList = NULL;
 
 // Module data
 struct nsGfxModuleData