diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj
index fb98a3d9c..04b00e020 100644
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@@ -1213,6 +1213,7 @@
 		5E74D2E31CC4429700D88B0B /* EditCursorOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E74D2DD1CC4429700D88B0B /* EditCursorOverlay.cpp */; };
 		5E74D2E41CC4429700D88B0B /* PlayIndicatorOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E74D2DF1CC4429700D88B0B /* PlayIndicatorOverlay.cpp */; };
 		5E74D2E51CC4429700D88B0B /* Scrubbing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E74D2E11CC4429700D88B0B /* Scrubbing.cpp */; };
+		5E79B3411D5CC38D001D677D /* ImportGStreamer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E79B33F1D5CC38D001D677D /* ImportGStreamer.cpp */; };
 		5E94A1BA1D1F1C8400A8713A /* wxPanelWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E94A1B81D1F1C8400A8713A /* wxPanelWrapper.cpp */; };
 		5ED1D0AD1CDE55BD00471E3C /* Overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ED1D0A91CDE55BD00471E3C /* Overlay.cpp */; };
 		5ED1D0AE1CDE55BD00471E3C /* OverlayPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ED1D0AB1CDE55BD00471E3C /* OverlayPanel.cpp */; };
@@ -2990,8 +2991,11 @@
 		5E74D2E01CC4429700D88B0B /* PlayIndicatorOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayIndicatorOverlay.h; sourceTree = "<group>"; };
 		5E74D2E11CC4429700D88B0B /* Scrubbing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Scrubbing.cpp; sourceTree = "<group>"; };
 		5E74D2E21CC4429700D88B0B /* Scrubbing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scrubbing.h; sourceTree = "<group>"; };
+		5E79B33F1D5CC38D001D677D /* ImportGStreamer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImportGStreamer.cpp; sourceTree = "<group>"; };
+		5E79B3401D5CC38D001D677D /* ImportGStreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImportGStreamer.h; sourceTree = "<group>"; };
 		5E94A1B81D1F1C8400A8713A /* wxPanelWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wxPanelWrapper.cpp; sourceTree = "<group>"; };
 		5E94A1B91D1F1C8400A8713A /* wxPanelWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wxPanelWrapper.h; sourceTree = "<group>"; };
+		5EB9EA281D5B81270050AF40 /* ImportForwards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImportForwards.h; sourceTree = "<group>"; };
 		5ED18DB61CC16B1E00FAFE95 /* Reverb_libSoX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reverb_libSoX.h; sourceTree = "<group>"; };
 		5ED18DB71CC290AB00FAFE95 /* wxFileNameWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wxFileNameWrapper.h; sourceTree = "<group>"; };
 		5ED1D0A91CDE55BD00471E3C /* Overlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Overlay.cpp; sourceTree = "<group>"; };
@@ -4216,16 +4220,15 @@
 			children = (
 				28F67173197DFA1C00075C32 /* FormatClassifier.cpp */,
 				28F67174197DFA1C00075C32 /* FormatClassifier.h */,
-				28F67175197DFA1C00075C32 /* MultiFormatReader.cpp */,
-				28F67176197DFA1C00075C32 /* MultiFormatReader.h */,
-				28F67177197DFA1C00075C32 /* SpecPowerMeter.cpp */,
-				28F67178197DFA1C00075C32 /* SpecPowerMeter.h */,
 				1790B07F09883BFD008A330A /* Import.cpp */,
 				1790B08009883BFD008A330A /* Import.h */,
 				283135EA0DFB9D110076D551 /* ImportFFmpeg.cpp */,
 				283135EB0DFB9D110076D551 /* ImportFFmpeg.h */,
 				1790B08109883BFD008A330A /* ImportFLAC.cpp */,
 				1790B08209883BFD008A330A /* ImportFLAC.h */,
+				5EB9EA281D5B81270050AF40 /* ImportForwards.h */,
+				5E79B33F1D5CC38D001D677D /* ImportGStreamer.cpp */,
+				5E79B3401D5CC38D001D677D /* ImportGStreamer.h */,
 				1790B08309883BFD008A330A /* ImportLOF.cpp */,
 				1790B08409883BFD008A330A /* ImportLOF.h */,
 				1790B08509883BFD008A330A /* ImportMIDI.cpp */,
@@ -4241,8 +4244,12 @@
 				2801A6440BF9268700648258 /* ImportQT.h */,
 				1790B08E09883BFD008A330A /* ImportRaw.cpp */,
 				1790B08F09883BFD008A330A /* ImportRaw.h */,
+				28F67175197DFA1C00075C32 /* MultiFormatReader.cpp */,
+				28F67176197DFA1C00075C32 /* MultiFormatReader.h */,
 				1790B09009883BFD008A330A /* RawAudioGuess.cpp */,
 				1790B09109883BFD008A330A /* RawAudioGuess.h */,
+				28F67177197DFA1C00075C32 /* SpecPowerMeter.cpp */,
+				28F67178197DFA1C00075C32 /* SpecPowerMeter.h */,
 			);
 			path = import;
 			sourceTree = "<group>";
@@ -7378,6 +7385,7 @@
 				1790B16309883BFD008A330A /* FreqWindow.cpp in Sources */,
 				1790B16509883BFD008A330A /* HistoryWindow.cpp in Sources */,
 				1790B16609883BFD008A330A /* ImageManipulation.cpp in Sources */,
+				5E79B3411D5CC38D001D677D /* ImportGStreamer.cpp in Sources */,
 				1790B16709883BFD008A330A /* Import.cpp in Sources */,
 				1790B16809883BFD008A330A /* ImportFLAC.cpp in Sources */,
 				1790B16909883BFD008A330A /* ImportLOF.cpp in Sources */,
diff --git a/src/Makefile.am b/src/Makefile.am
index e312ba7d0..9cc89aff1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -418,6 +418,7 @@ audacity_SOURCES = \
 	import/Import.h \
 	import/ImportFLAC.cpp \
 	import/ImportFLAC.h \
+	import/ImportForwards.h \
 	import/ImportLOF.cpp \
 	import/ImportLOF.h \
 	import/ImportMP3.cpp \
diff --git a/src/import/FormatClassifier.cpp b/src/import/FormatClassifier.cpp
index ab7225744..462ac34e8 100644
--- a/src/import/FormatClassifier.cpp
+++ b/src/import/FormatClassifier.cpp
@@ -17,6 +17,8 @@ the low-pass-like spectral behaviour of natural audio signals
 for classification of the sample format and the used endianness.
 
 *//*******************************************************************/
+#include "FormatClassifier.h"
+
 #include <stdint.h>
 #include <cmath>
 #include <cfloat>
@@ -29,8 +31,6 @@ for classification of the sample format and the used endianness.
 #include "SpecPowerMeter.h"
 #include "sndfile.h"
 
-#include "FormatClassifier.h"
-
 FormatClassifier::FormatClassifier(const char* filename) :
    mReader(filename),
    mMeter(cSiglen)
diff --git a/src/import/FormatClassifier.h b/src/import/FormatClassifier.h
index 6041fd927..2fac44856 100644
--- a/src/import/FormatClassifier.h
+++ b/src/import/FormatClassifier.h
@@ -11,6 +11,13 @@
 #ifndef __AUDACITY_FORMATCLASSIFIER_H_
 #define __AUDACITY_FORMATCLASSIFIER_H_
 
+#include <vector>
+#include "../SampleFormat.h"
+#include "MultiFormatReader.h"
+#include "SpecPowerMeter.h"
+
+#include <sndfile.h>
+
 #ifndef SNDFILE_1
 #error Requires libsndfile 1.0.3 or higher
 #endif
diff --git a/src/import/Import.cpp b/src/import/Import.cpp
index 0d8aba2b6..a52b893d1 100644
--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@@ -37,6 +37,7 @@ and ImportLOF.cpp.
 
 #include "../Audacity.h"
 #include "Import.h"
+
 #include "ImportPlugin.h"
 
 #include <wx/textctrl.h>
diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp
index b5c9bb390..beff6bdb4 100644
--- a/src/import/ImportFFmpeg.cpp
+++ b/src/import/ImportFFmpeg.cpp
@@ -20,10 +20,12 @@ Licensed under the GNU General Public License v2 or later
 
 *//*******************************************************************/
 
+#include "../Audacity.h"    // needed before FFmpeg.h
+#include "ImportFFmpeg.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
-#include "../Audacity.h"    // needed before FFmpeg.h
 #include "../FFmpeg.h"      // which brings in avcodec.h, avformat.h
 #include "../ondemand/ODManager.h"
 #ifndef WX_PRECOMP
@@ -151,7 +153,6 @@ static const wxChar *exts[] =
 
 // all the includes live here by default
 #include "Import.h"
-#include "ImportFFmpeg.h"
 #include "../Tags.h"
 #include "../Internat.h"
 #include "../WaveTrack.h"
diff --git a/src/import/ImportFFmpeg.h b/src/import/ImportFFmpeg.h
index a4649d952..41395ce18 100644
--- a/src/import/ImportFFmpeg.h
+++ b/src/import/ImportFFmpeg.h
@@ -11,10 +11,7 @@ LRN
 #ifndef __AUDACITY_IMPORT_FFMPEG__
 #define __AUDACITY_IMPORT_FFMPEG__
 
-#include "ImportPlugin.h"
-
-class ImportPluginList;
-class UnusableImportPluginList;
+#include "ImportForwards.h"
 
 void GetFFmpegImportPlugin(ImportPluginList *importPluginList,
                            UnusableImportPluginList *unusableImportPluginList);
diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp
index a3e9ebb23..7c11a0d66 100644
--- a/src/import/ImportFLAC.cpp
+++ b/src/import/ImportFLAC.cpp
@@ -22,6 +22,9 @@
 
 *//*******************************************************************/
 
+#include "../Audacity.h"
+#include "ImportFLAC.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
@@ -33,7 +36,6 @@
 #include <wx/defs.h>
 #include <wx/intl.h>    // needed for _("translated stings") even if we
                         // don't have libflac available
-#include "../Audacity.h"
 
 #include "Import.h"
 #include "ImportPlugin.h"
@@ -66,7 +68,6 @@ void GetFLACImportPlugin(ImportPluginList *importPluginList,
 #else /* USE_LIBFLAC */
 
 #include "../Internat.h"
-#include "ImportFLAC.h"
 
 #include <wx/string.h>
 #include <wx/utils.h>
diff --git a/src/import/ImportFLAC.h b/src/import/ImportFLAC.h
index cf5456497..0dc38ca8b 100644
--- a/src/import/ImportFLAC.h
+++ b/src/import/ImportFLAC.h
@@ -11,8 +11,7 @@
 #ifndef __AUDACITY_IMPORT_FLAC__
 #define __AUDACITY_IMPORT_FLAC__
 
-class ImportPluginList;
-class UnusableImportPluginList;
+#include "ImportForwards.h"
 
 void GetFLACImportPlugin(ImportPluginList *importPluginList,
                          UnusableImportPluginList *unusableImportPluginList);
diff --git a/src/import/ImportForwards.h b/src/import/ImportForwards.h
new file mode 100644
index 000000000..79f266b3a
--- /dev/null
+++ b/src/import/ImportForwards.h
@@ -0,0 +1,21 @@
+//
+//  ImportForwards.h
+//  Audacity
+//
+//  Created by Paul Licameli on 8/10/16.
+//
+//
+
+#ifndef __AUDACITY_IMPORT_FORWARDS__
+#define __AUDACITY_IMPORT_FORWARDS__
+
+#include <wx/list.h>
+#include "../MemoryX.h"
+
+class ImportPlugin;
+class UnusableImportPlugin;
+
+WX_DECLARE_LIST(ImportPlugin, ImportPluginList);
+WX_DECLARE_LIST(UnusableImportPlugin, UnusableImportPluginList);
+
+#endif
diff --git a/src/import/ImportLOF.h b/src/import/ImportLOF.h
index df89b9ec5..af2a51e1c 100644
--- a/src/import/ImportLOF.h
+++ b/src/import/ImportLOF.h
@@ -54,8 +54,7 @@
 #ifndef __AUDACITY_IMPORT_LOF__
 #define __AUDACITY_IMPORT_LOF__
 
-class ImportPluginList;
-class UnusableImportPluginList;
+#include "ImportForwards.h"
 
 void GetLOFImportPlugin(ImportPluginList *importPluginList,
                         UnusableImportPluginList *unusableImportPluginList);
diff --git a/src/import/ImportMIDI.cpp b/src/import/ImportMIDI.cpp
index 2667a27ee..49126e79d 100644
--- a/src/import/ImportMIDI.cpp
+++ b/src/import/ImportMIDI.cpp
@@ -8,13 +8,14 @@
 
 **********************************************************************/
 
+#include "../Audacity.h"
+#include "ImportMIDI.h"
+
 #include <wx/defs.h>
 #include <wx/msgdlg.h>
 #include <wx/ffile.h>
 #include <wx/intl.h>
 
-#include "../Audacity.h"
-
 #if defined(USE_MIDI)
 
 //#include "allegro.h"
@@ -23,7 +24,6 @@
 
 #include "../Internat.h"
 #include "../NoteTrack.h"
-#include "ImportMIDI.h"
 
 bool ImportMIDI(const wxString &fName, NoteTrack * dest)
 {
diff --git a/src/import/ImportMIDI.h b/src/import/ImportMIDI.h
index 1c596d2ce..e16bc720a 100644
--- a/src/import/ImportMIDI.h
+++ b/src/import/ImportMIDI.h
@@ -22,6 +22,7 @@ into a NoteTrack.
 
 #if defined(USE_MIDI)
 
+class wxString;
 class NoteTrack;
 
 bool ImportMIDI(const wxString &fName, NoteTrack * dest);
diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp
index 5a6ef2031..30daf344b 100644
--- a/src/import/ImportMP3.cpp
+++ b/src/import/ImportMP3.cpp
@@ -26,6 +26,9 @@
 
 *//*******************************************************************/
 
+#include "../Audacity.h"
+#include "ImportMP3.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
@@ -35,11 +38,9 @@
 
 #include <wx/defs.h>
 #include <wx/intl.h>
-#include "../Audacity.h"
 
 #include "../Prefs.h"
 #include "Import.h"
-#include "ImportMP3.h"
 #include "ImportPlugin.h"
 #include "../Internat.h"
 #include "../Tags.h"
diff --git a/src/import/ImportMP3.h b/src/import/ImportMP3.h
index 9c055b896..bebd28c34 100644
--- a/src/import/ImportMP3.h
+++ b/src/import/ImportMP3.h
@@ -11,8 +11,7 @@
 #ifndef __AUDACITY_IMPORT_MP3__
 #define __AUDACITY_IMPORT_MP3__
 
-class ImportPluginList;
-class UnusableImportPluginList;
+#include "ImportForwards.h"
 
 void GetMP3ImportPlugin(ImportPluginList *importPluginList,
                         UnusableImportPluginList *unusableImportPluginList);
diff --git a/src/import/ImportOGG.cpp b/src/import/ImportOGG.cpp
index 05bc618ae..e81cc8e42 100644
--- a/src/import/ImportOGG.cpp
+++ b/src/import/ImportOGG.cpp
@@ -28,6 +28,9 @@
 
 *//*******************************************************************/
 
+#include "../Audacity.h"
+#include "ImportOGG.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
@@ -36,12 +39,10 @@
 #endif
 
 #include <wx/intl.h>
-#include "../Audacity.h"
 #include "../Prefs.h"
 #include "../Internat.h"
 #include "../Tags.h"
 
-#include "ImportOGG.h"
 
 #define DESC _("Ogg Vorbis files")
 
diff --git a/src/import/ImportOGG.h b/src/import/ImportOGG.h
index e460e0c8f..946384188 100644
--- a/src/import/ImportOGG.h
+++ b/src/import/ImportOGG.h
@@ -11,8 +11,7 @@
 #ifndef __AUDACITY_IMPORT_OGG__
 #define __AUDACITY_IMPORT_OGG__
 
-class ImportPluginList;
-class UnusableImportPluginList;
+#include "ImportForwards.h"
 
 void GetOGGImportPlugin(ImportPluginList *importPluginList,
                         UnusableImportPluginList *unusableImportPluginList);
diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp
index 816295bdf..cce787a00 100644
--- a/src/import/ImportPCM.cpp
+++ b/src/import/ImportPCM.cpp
@@ -20,10 +20,10 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "ImportPCM.h"
 #include "../AudacityApp.h"
 #include "../Internat.h"
 #include "../Tags.h"
-#include "ImportPCM.h"
 
 #include <wx/wx.h>
 #include <wx/string.h>
diff --git a/src/import/ImportPCM.h b/src/import/ImportPCM.h
index ccccca161..ead1e4bf7 100644
--- a/src/import/ImportPCM.h
+++ b/src/import/ImportPCM.h
@@ -11,8 +11,7 @@
 #ifndef __AUDACITY_IMPORT_PCM__
 #define __AUDACITY_IMPORT_PCM__
 
-class ImportPluginList;
-class UnusableImportPluginList;
+#include "ImportForwards.h"
 
 void GetPCMImportPlugin(ImportPluginList *importPluginList,
                         UnusableImportPluginList *unusableImportPluginList);
diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h
index c8baf758c..5d9189088 100644
--- a/src/import/ImportPlugin.h
+++ b/src/import/ImportPlugin.h
@@ -59,7 +59,6 @@ but little else.
 #include <wx/arrstr.h>
 #include <wx/filename.h>
 #include <wx/string.h>
-#include <wx/list.h>
 #include "../MemoryX.h"
 
 #include "../widgets/ProgressDialog.h"
@@ -197,7 +196,4 @@ private:
    wxArrayString mExtensions;
 };
 
-WX_DECLARE_LIST(ImportPlugin, ImportPluginList);
-WX_DECLARE_LIST(UnusableImportPlugin, UnusableImportPluginList);
-
 #endif
diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp
index 97d808ca9..c7438392d 100644
--- a/src/import/ImportQT.cpp
+++ b/src/import/ImportQT.cpp
@@ -13,6 +13,7 @@
 **********************************************************************/
 
 #include "../Audacity.h"
+#include "ImportQT.h"
 #include "ImportPlugin.h"
 
 #define DESC _("QuickTime files")
@@ -66,7 +67,6 @@ void GetQTImportPlugin(ImportPluginList *importPluginList,
 #include "../Internat.h"
 #include "../Tags.h"
 #include "../WaveTrack.h"
-#include "ImportQT.h"
 
 #define kQTAudioPropertyID_MaxAudioSampleSize   'mssz'
 
diff --git a/src/import/ImportQT.h b/src/import/ImportQT.h
index 5442a4c8d..c4c374285 100644
--- a/src/import/ImportQT.h
+++ b/src/import/ImportQT.h
@@ -11,8 +11,7 @@
 #ifndef __AUDACITY_IMPORT_QT__
 #define __AUDACITY_IMPORT_QT__
 
-class ImportPluginList;
-class UnusableImportPluginList;
+#include "ImportForwards.h"
 
 void GetQTImportPlugin(ImportPluginList *importPluginList,
                        UnusableImportPluginList *unusableImportPluginList);
diff --git a/src/import/ImportRaw.cpp b/src/import/ImportRaw.cpp
index 183b12001..6380cacd8 100644
--- a/src/import/ImportRaw.cpp
+++ b/src/import/ImportRaw.cpp
@@ -22,8 +22,8 @@ and sample size to help you importing data of an unknown format.
 
 
 #include "../Audacity.h"
-
 #include "ImportRaw.h"
+
 #include "Import.h"
 
 #include "../DirManager.h"
diff --git a/src/import/MultiFormatReader.cpp b/src/import/MultiFormatReader.cpp
index 7dc574766..890673bff 100644
--- a/src/import/MultiFormatReader.cpp
+++ b/src/import/MultiFormatReader.cpp
@@ -14,6 +14,8 @@ machine endianness representations.
 
 *//*******************************************************************/
 
+#include "MultiFormatReader.h"
+
 #include <exception>
 #include <stdexcept>
 #include <cstring>
@@ -22,7 +24,18 @@ machine endianness representations.
 
 #include <wx/defs.h>
 
-#include "MultiFormatReader.h"
+MachineEndianness::MachineEndianness()
+{
+   if (wxBYTE_ORDER == wxLITTLE_ENDIAN)
+   {
+      mFlag = MachineEndianness::Little;
+   }
+   else
+   {
+      mFlag = MachineEndianness::Big;
+   }
+}
+
 
 MultiFormatReader::MultiFormatReader(const char* filename)
    : mpFid(NULL)
diff --git a/src/import/MultiFormatReader.h b/src/import/MultiFormatReader.h
index 3026d09d5..73d1f4722 100644
--- a/src/import/MultiFormatReader.h
+++ b/src/import/MultiFormatReader.h
@@ -11,6 +11,9 @@
 #ifndef __AUDACITY_MULTIFORMATREADER_H__
 #define __AUDACITY_MULTIFORMATREADER_H__
 
+#include <stdio.h>
+#include <stdint.h>
+
 class MachineEndianness
 {
 public:
@@ -20,17 +23,7 @@ public:
       Big
    } EndiannessT;
 
-   MachineEndianness()
-   {
-      if (wxBYTE_ORDER == wxLITTLE_ENDIAN)
-      {
-         mFlag = MachineEndianness::Little;
-      }
-      else
-      {
-         mFlag = MachineEndianness::Big;
-      }
-   }
+   MachineEndianness();
    ~MachineEndianness()
    {}
 
diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp
index 16e0e3b99..56d01e3c0 100644
--- a/src/import/RawAudioGuess.cpp
+++ b/src/import/RawAudioGuess.cpp
@@ -13,6 +13,8 @@
 
 **********************************************************************/
 
+#include "RawAudioGuess.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -22,7 +24,6 @@
 #include <wx/ffile.h>
 
 #include "../Internat.h"
-#include "RawAudioGuess.h"
 
 #define RAW_GUESS_DEBUG 0
 
diff --git a/src/import/SpecPowerMeter.cpp b/src/import/SpecPowerMeter.cpp
index 546525be8..b1394731a 100644
--- a/src/import/SpecPowerMeter.cpp
+++ b/src/import/SpecPowerMeter.cpp
@@ -16,12 +16,13 @@ measurements in subbands or in the entire signal band.
 
 *//*******************************************************************/
 
+#include "SpecPowerMeter.h"
+
 #include <cmath>
 #include <cstdlib>
 #include <wx/defs.h>
 
 #include "../FFT.h"
-#include "SpecPowerMeter.h"
 
 SpecPowerMeter::SpecPowerMeter(int sigLen)
 {
diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj
index aca7d4511..f878a9e7c 100755
--- a/win/Projects/Audacity/Audacity.vcxproj
+++ b/win/Projects/Audacity/Audacity.vcxproj
@@ -432,6 +432,7 @@
     <ClInclude Include="..\..\..\src\effects\Phaser.h" />
     <ClInclude Include="..\..\..\src\effects\VST\VSTControlMSW.h" />
     <ClInclude Include="..\..\..\src\import\FormatClassifier.h" />
+    <ClInclude Include="..\..\..\src\import\ImportForwards.h" />
     <ClInclude Include="..\..\..\src\import\ImportGStreamer.h" />
     <ClInclude Include="..\..\..\src\import\MultiFormatReader.h" />
     <ClInclude Include="..\..\..\src\import\SpecPowerMeter.h" />
diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters
index ee1232677..93c340e56 100755
--- a/win/Projects/Audacity/Audacity.vcxproj.filters
+++ b/win/Projects/Audacity/Audacity.vcxproj.filters
@@ -1795,6 +1795,9 @@
     <ClInclude Include="..\..\..\src\widgets\wxPanelWrapper.h">
       <Filter>src\widgets</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\import\ImportForwards.h">
+      <Filter>src\import</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\audacity.ico">