Invert dependency of TranslatableString and audacity/Types.h

include/audacity/Types.h

@@ -50,7 +50,7 @@
 #include <wx/debug.h> // for wxASSERT
 #include <wx/string.h> // type used in inline function and member variable
 
-#include "../../../src/TranslatableString.h"
+#include "Internat.h"
 
 // ----------------------------------------------------------------------------
 // TODO:  I'd imagine this header may be replaced by other public headers. But,

src/ActiveProjects.h

@@ -12,8 +12,6 @@
 
 #include "Identifier.h"
 
-#include <wx/string.h>
-
 namespace ActiveProjects
 {
    FilePaths GetAll();

src/Internat.h

@@ -12,11 +12,10 @@
 #ifndef __AUDACITY_INTERNAT__
 #define __AUDACITY_INTERNAT__
 
-
+#include <vector>
-
 #include <wx/longlong.h>
 
-#include "audacity/Types.h"
+#include "TranslatableString.h"
 
 class wxArrayString;
 class wxArrayStringEx;

src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h

@@ -14,6 +14,7 @@ Paul Licameli split from class WaveTrack
 #include "../../../ui/CommonTrackView.h"
 #include "../../../../ClientData.h"
 namespace WaveTrackViewConstants{ enum Display : int; }
+#include "audacity/Types.h"
 struct WaveTrackSubViewType;
 
 class CutlineHandle;