diff --git a/src/commands/CommandTargets.cpp b/src/commands/CommandTargets.cpp
index ce4f4fe85..07fe8016b 100644
--- a/src/commands/CommandTargets.cpp
+++ b/src/commands/CommandTargets.cpp
@@ -432,3 +432,8 @@ InteractiveOutputTargets::InteractiveOutputTargets() :
    )
 {
 }
+
+void StatusBarTarget::Update(const wxString &message)
+{
+   mStatus.SetStatusText(message, 0);
+}
diff --git a/src/commands/CommandTargets.h b/src/commands/CommandTargets.h
index 822aa27ad..6bbf429ea 100644
--- a/src/commands/CommandTargets.h
+++ b/src/commands/CommandTargets.h
@@ -219,10 +219,7 @@ public:
    StatusBarTarget(wxStatusBar &sb)
       : mStatus(sb)
    {}
-   void Update(const wxString &message) override
-   {
-      mStatus.SetStatusText(message, 0);
-   }
+   void Update(const wxString &message) override;
 };
 
 /// Adds messages to a response queue (to be sent back to a script)
diff --git a/src/import/Import.cpp b/src/import/Import.cpp
index b1b4bdaaa..81f5ee79e 100644
--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@@ -747,3 +747,16 @@ void ImportStreamDialog::OnCancel(wxCommandEvent & WXUNUSED(event))
    EndModal( wxID_CANCEL );
 }
 
+ImportFileHandle::~ImportFileHandle()
+{
+}
+
+void ImportFileHandle::CreateProgress()
+{
+   wxFileName ff( mFilename );
+   wxString title;
+
+   title.Printf(_("Importing %s"), GetFileDescription());
+   mProgress.create(title, ff.GetFullName());
+}
+
diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h
index 83c864a45..08b3470ab 100644
--- a/src/import/ImportPlugin.h
+++ b/src/import/ImportPlugin.h
@@ -127,20 +127,11 @@ public:
    {
    }
 
-   virtual ~ImportFileHandle()
-   {
-   }
+   virtual ~ImportFileHandle();
 
    // The importer should call this to create the progress dialog and
    // identify the filename being imported.
-   void CreateProgress()
-   {
-      wxFileName ff(mFilename);
-      wxString title;
-
-      title.Printf(_("Importing %s"), GetFileDescription());
-      mProgress.create(title, ff.GetFullName());
-   }
+   void CreateProgress();
 
    // This is similar to GetImporterDescription, but if possible the
    // importer will return a more specific description of the