diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h
index c4ce965d9..df2425e4f 100644
--- a/src/ShuttleGui.h
+++ b/src/ShuttleGui.h
@@ -16,6 +16,7 @@
 
 #include "Audacity.h"
 
+#include <wx/grid.h>
 #include <wx/string.h>
 
 #include "WrappedType.h" 
diff --git a/src/import/Import.cpp b/src/import/Import.cpp
index 04c6f1807..32c56fb83 100644
--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@@ -39,9 +39,10 @@ and ImportLOF.cpp.
 #include <wx/msgdlg.h>
 #include <wx/string.h>
 #include <wx/intl.h>
-#include <wx/listimpl.cpp>
 #include <wx/log.h>
 #include <wx/sizer.h>         //for wxBoxSizer
+#include <wx/arrimpl.cpp>
+#include <wx/listimpl.cpp>
 #include "../ShuttleGui.h"
 #include "../Audacity.h"
 
@@ -62,6 +63,7 @@ and ImportLOF.cpp.
 WX_DEFINE_LIST(ImportPluginList);
 WX_DEFINE_LIST(UnusableImportPluginList);
 WX_DEFINE_LIST(FormatList);
+WX_DEFINE_OBJARRAY(ExtImportItems);
 
 Importer::Importer()
 {
@@ -165,10 +167,11 @@ void Importer::ReadImportItems()
       if (toker.HasMoreTokens())
         mime_types = toker.GetNextToken();
 
-      StringToList (extensions, wxString(wxT(":")), new_item->extensions);
+      wxString delims(wxT(":"));
+      StringToList (extensions, delims, new_item->extensions);
 
       if (mime_types != wxEmptyString)
-         StringToList (mime_types, wxString(wxT(":")), new_item->mime_types);
+         StringToList (mime_types, delims, new_item->mime_types);
       
       /* Filter token consists of used and unused filter lists */
       toker.SetString(filters, wxT("\\"), wxTOKEN_RET_EMPTY_ALL);
@@ -176,7 +179,7 @@ void Importer::ReadImportItems()
       if (toker.HasMoreTokens())
         unused_filters = toker.GetNextToken();
       
-      StringToList (used_filters, wxString(wxT(":")), new_item->filters);
+      StringToList (used_filters, delims, new_item->filters);
 
       if (unused_filters != wxEmptyString)
       {
@@ -184,7 +187,7 @@ void Importer::ReadImportItems()
           * unused filters start is remembered
           */
          new_item->divider = new_item->filters.Count();
-         StringToList (unused_filters, wxString(wxT(":")), new_item->filters);
+         StringToList (unused_filters, delims, new_item->filters);
       }
       else
          new_item->divider = -1;
diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp
index df239bb8f..d7c8793f8 100644
--- a/src/prefs/ExtImportPrefs.cpp
+++ b/src/prefs/ExtImportPrefs.cpp
@@ -13,21 +13,18 @@
 
 *//*******************************************************************/
 
-#include "../Audacity.h"
 
 #include <wx/defs.h>
+#include <wx/listctrl.h>
 
+#include "ExtImportPrefs.h"
+#include "../Audacity.h"
+#include "../AudacityApp.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 
-#include "ExtImportPrefs.h"
-
-#include <wx/arrimpl.cpp> // this is a magic incantation which must be done!
-
 #define EXTIMPORT_MIME_SUPPORT 0
 
-WX_DEFINE_OBJARRAY(ExtImportItems);
-
 enum ExtImportPrefsControls
 {
   EIPPluginList = 20000,
@@ -81,7 +78,7 @@ void ExtImportPrefs::Populate()
    RuleTable->SetSelectionMode (wxGrid::wxGridSelectRows);
    ExtImportItems *items = wxGetApp().mImporter->GetImportItems();
 
-   for (int i = 0; i < items->Count(); i++)
+   for (unsigned int i = 0; i < items->Count(); i++)
       AddItemToTable (i, &(*items)[i]);
    // ----------------------- End of main section --------------
 }
@@ -346,15 +343,16 @@ void ExtImportPrefs::OnRuleTableEdit (wxGridEvent& event)
    ExtImportItem *item = &(*items)[row];
    RuleTable->SaveEditControlValue();
    wxString val = RuleTable->GetCellValue (row, col);
+   wxString delims(wxT(":"));
    switch (col)
    {
    case 0:
       item->extensions.Clear();
-      wxGetApp().mImporter->StringToList (val, wxString(wxT(":")), item->extensions);
+      wxGetApp().mImporter->StringToList (val, delims, item->extensions);
       break;
    case 1:
       item->mime_types.Clear();
-      wxGetApp().mImporter->StringToList (val, wxString(wxT(":")), item->mime_types);
+      wxGetApp().mImporter->StringToList (val, delims, item->mime_types);
       break;
    }
    RuleTable->AutoSizeColumns ();
@@ -366,7 +364,7 @@ void ExtImportPrefs::AddItemToTable (int index, ExtImportItem *item)
    if (item->extensions.Count() > 0)
    {
       extensions.Append (item->extensions[0]);
-      for (int i = 1; i < item->extensions.Count(); i++)
+      for (unsigned int i = 1; i < item->extensions.Count(); i++)
       {
          extensions.Append (wxT(":"));
          extensions.Append (item->extensions[i]);
@@ -375,7 +373,7 @@ void ExtImportPrefs::AddItemToTable (int index, ExtImportItem *item)
    if (item->mime_types.Count() > 0)
    {
       mime_types.Append (item->mime_types[0]);
-      for (int i = 1; i < item->mime_types.Count(); i++)
+      for (unsigned int i = 1; i < item->mime_types.Count(); i++)
       {
          mime_types.Append (wxT(":"));
          mime_types.Append (item->mime_types[i]);
diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h
index 5229d060d..9a1648f66 100644
--- a/src/prefs/ExtImportPrefs.h
+++ b/src/prefs/ExtImportPrefs.h
@@ -19,9 +19,10 @@
 
 #include "PrefsPanel.h"
 
-#include "../Import/Import.h"
-#include "../Import/ImportPlugin.h"
+#include "../import/Import.h"
+#include "../import/ImportPlugin.h"
 
+class wxListEvent;
 
 class ExtImportPrefs:public PrefsPanel
 {
@@ -59,4 +60,4 @@ class ExtImportPrefs:public PrefsPanel
    DECLARE_EVENT_TABLE()
 };
 
-#endif
\ No newline at end of file
+#endif