diff --git a/include/audacity/Types.h b/include/audacity/Types.h
index 8b00333f9..be6694fb2 100644
--- a/include/audacity/Types.h
+++ b/include/audacity/Types.h
@@ -219,41 +219,4 @@ typedef const char *constSamplePtr;
 // ----------------------------------------------------------------------------
 typedef wxString PluginID;
 
-// ----------------------------------------------------------------------------
-// Supported channel assignments
-// ----------------------------------------------------------------------------
-
-typedef enum
-{
-   // Use to mark end of list
-   ChannelNameEOL = -1,
-   // The default channel assignment
-   ChannelNameMono,
-   // From this point, the channels follow the 22.2 surround sound format
-   ChannelNameFrontLeft,
-   ChannelNameFrontRight,
-   ChannelNameFrontCenter,
-   ChannelNameLowFrequency1,
-   ChannelNameBackLeft,
-   ChannelNameBackRight,
-   ChannelNameFrontLeftCenter,
-   ChannelNameFrontRightCenter,
-   ChannelNameBackCenter,
-   ChannelNameLowFrequency2,
-   ChannelNameSideLeft,
-   ChannelNameSideRight,
-   ChannelNameTopFrontLeft,
-   ChannelNameTopFrontRight,
-   ChannelNameTopFrontCenter,
-   ChannelNameTopCenter,
-   ChannelNameTopBackLeft,
-   ChannelNameTopBackRight,
-   ChannelNameTopSideLeft,
-   ChannelNameTopSideRight,
-   ChannelNameTopBackCenter,
-   ChannelNameBottomFrontCenter,
-   ChannelNameBottomFrontLeft,
-   ChannelNameBottomFrontRight,
-} ChannelName, *ChannelNames;
-
 #endif // __AUDACITY_TYPES_H__
diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 591c14d0f..b9cd55a39 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -7,6 +7,7 @@ set( LIBRARIES
    lib-strings
    lib-utility
    lib-uuid
+   lib-components
 )
 
 if ( ${_OPT}has_networking )
diff --git a/libraries/lib-components/CMakeLists.txt b/libraries/lib-components/CMakeLists.txt
new file mode 100644
index 000000000..bf48381c2
--- /dev/null
+++ b/libraries/lib-components/CMakeLists.txt
@@ -0,0 +1,29 @@
+#[[
+Various abstract base classes related to modules and plugins.
+
+ComponentInterfaceSymbol, which pairs an internal identifier string (suitable
+for storing as a configuration file value) with a user-visible translatable
+string.  It serves to "name" various things.
+
+CommandParameters, for write and reading key-value pairs to and from strings.
+]]#
+
+list( APPEND SOURCES
+   ComponentInterface.cpp
+   ComponentInterface.h
+   ComponentInterfaceSymbol.h
+   ConfigInterface.cpp
+   ConfigInterface.h
+   EffectAutomationParameters.cpp
+   EffectAutomationParameters.h
+   EffectInterface.cpp
+   EffectInterface.h
+   ModuleInterface.cpp
+   ModuleInterface.h
+   PluginInterface.cpp
+   PluginInterface.h
+)
+audacity_library( lib-components "${SOURCES}"
+   "lib-strings-interface;PRIVATE;wxBase"
+   "" ""
+)
diff --git a/libraries/lib-components/ComponentInterface.cpp b/libraries/lib-components/ComponentInterface.cpp
new file mode 100644
index 000000000..5afa0e102
--- /dev/null
+++ b/libraries/lib-components/ComponentInterface.cpp
@@ -0,0 +1,10 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  @file ComponentInterface.cpp
+
+**********************************************************************/
+#include "ComponentInterface.h"
+
+ComponentInterface::~ComponentInterface() = default;
diff --git a/include/audacity/ComponentInterface.h b/libraries/lib-components/ComponentInterface.h
similarity index 96%
rename from include/audacity/ComponentInterface.h
rename to libraries/lib-components/ComponentInterface.h
index ad8933b27..286f841be 100644
--- a/include/audacity/ComponentInterface.h
+++ b/libraries/lib-components/ComponentInterface.h
@@ -43,7 +43,7 @@
 #define __AUDACITY_COMPONENT_INTERFACE_H__
 
 #include "Identifier.h"
-#include "audacity/Types.h"
+#include "Internat.h"
 #include <wx/string.h> // member variables
 
 class ComponentInterfaceSymbol;
@@ -58,10 +58,10 @@ plugins.  It is what makes a class a plug-in.  Additionally it provides an
 optional parameter definitions function, for those components such as commands,
 effects and (soon) preference pagess that define parameters.
 ********************************************************************************/
-class AUDACITY_DLL_API ComponentInterface /* not final */
+class COMPONENTS_API ComponentInterface /* not final */
 {
 public:
-   virtual ~ComponentInterface() {};
+   virtual ~ComponentInterface();
 
    // These should return an untranslated value
    virtual PluginPath GetPath() = 0;
diff --git a/src/ComponentInterfaceSymbol.h b/libraries/lib-components/ComponentInterfaceSymbol.h
similarity index 100%
rename from src/ComponentInterfaceSymbol.h
rename to libraries/lib-components/ComponentInterfaceSymbol.h
diff --git a/libraries/lib-components/ConfigInterface.cpp b/libraries/lib-components/ConfigInterface.cpp
new file mode 100644
index 000000000..8b8907810
--- /dev/null
+++ b/libraries/lib-components/ConfigInterface.cpp
@@ -0,0 +1,10 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  @file ConfigInterface.cpp
+
+**********************************************************************/
+#include "ConfigInterface.h"
+
+ConfigClientInterface::~ConfigClientInterface() = default;
diff --git a/include/audacity/ConfigInterface.h b/libraries/lib-components/ConfigInterface.h
similarity index 97%
rename from include/audacity/ConfigInterface.h
rename to libraries/lib-components/ConfigInterface.h
index e4c015c18..fb8a4547c 100644
--- a/include/audacity/ConfigInterface.h
+++ b/libraries/lib-components/ConfigInterface.h
@@ -43,6 +43,7 @@
 #define __AUDACITY_CONFIGINTERFACE_H__
 
 #include "Identifier.h"
+#include <vector>
 
 /*************************************************************************************//**
 
@@ -53,10 +54,10 @@ differentiates between private and shared config.  It should probably be replace
 with a Shuttle.
 
 *******************************************************************************************/
-class AUDACITY_DLL_API ConfigClientInterface /* not final */
+class COMPONENTS_API ConfigClientInterface /* not final */
 {
 public:
-   virtual ~ConfigClientInterface() {};
+   virtual ~ConfigClientInterface();
 
    virtual bool HasSharedConfigGroup(const RegistryPath & group) = 0;
    virtual bool GetSharedConfigSubgroups(const RegistryPath & group, RegistryPaths & subgroups) = 0;
diff --git a/libraries/lib-components/EffectAutomationParameters.cpp b/libraries/lib-components/EffectAutomationParameters.cpp
new file mode 100644
index 000000000..228c2572b
--- /dev/null
+++ b/libraries/lib-components/EffectAutomationParameters.cpp
@@ -0,0 +1,10 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  @file EffectAutomationParameters.cpp
+
+**********************************************************************/
+#include "EffectAutomationParameters.h"
+
+CommandParameters::~CommandParameters() = default;
diff --git a/include/audacity/EffectAutomationParameters.h b/libraries/lib-components/EffectAutomationParameters.h
similarity index 99%
rename from include/audacity/EffectAutomationParameters.h
rename to libraries/lib-components/EffectAutomationParameters.h
index 60c797803..32528b2a6 100644
--- a/include/audacity/EffectAutomationParameters.h
+++ b/libraries/lib-components/EffectAutomationParameters.h
@@ -52,7 +52,6 @@
 #include "ComponentInterface.h"
 #include "ComponentInterfaceSymbol.h"
 
-
 /**
 \brief CommandParameters, derived from wxFileConfig, is essentially doing 
 the same things as the Shuttle classes.  It does text <-> binary conversions of
@@ -64,7 +63,7 @@ wxWidget validators, and can create default dialogs.  However until that convers
 done, we need this class, and we use a pointer to one from within a Shuttle when interfacing
 with the code that still uses it.
 */
-class CommandParameters final : public wxFileConfig
+class COMPONENTS_API CommandParameters final : public wxFileConfig
 {
 public:
    CommandParameters(const wxString & parms = {})
@@ -78,9 +77,7 @@ public:
       SetParameters(parms);
    }
 
-   virtual ~CommandParameters()
-   {
-   }
+   virtual ~CommandParameters();
 
    virtual bool HasGroup(const wxString & strName) const override
    {
diff --git a/libraries/lib-components/EffectInterface.cpp b/libraries/lib-components/EffectInterface.cpp
new file mode 100644
index 000000000..644f5ffb8
--- /dev/null
+++ b/libraries/lib-components/EffectInterface.cpp
@@ -0,0 +1,18 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  @file EffectInterface.cpp
+
+**********************************************************************/
+#include "EffectInterface.h"
+
+EffectDefinitionInterface::~EffectDefinitionInterface() = default;
+
+EffectHostInterface::~EffectHostInterface() = default;
+
+EffectClientInterface::~EffectClientInterface() = default;
+
+EffectUIHostInterface::~EffectUIHostInterface() = default;
+
+EffectUIClientInterface::~EffectUIClientInterface() = default;
diff --git a/include/audacity/EffectInterface.h b/libraries/lib-components/EffectInterface.h
similarity index 81%
rename from include/audacity/EffectInterface.h
rename to libraries/lib-components/EffectInterface.h
index d2ffb09fd..6dae4512d 100755
--- a/include/audacity/EffectInterface.h
+++ b/libraries/lib-components/EffectInterface.h
@@ -44,11 +44,10 @@
 
 #include <functional>
 
-#include "Identifier.h"
-#include "audacity/ComponentInterface.h"
+#include "ComponentInterface.h"
 #include "ComponentInterfaceSymbol.h"
-#include "audacity/ConfigInterface.h"
-#include "audacity/EffectAutomationParameters.h" // for command automation
+#include "ConfigInterface.h"
+#include "EffectAutomationParameters.h" // for command automation
 
 class ShuttleGui;
 
@@ -63,6 +62,8 @@ typedef enum EffectType : int
 } EffectType;
 
 
+using EffectFamilySymbol = ComponentInterfaceSymbol;
+
 /*************************************************************************************//**
 
 \class EffectDefinitionInterface 
@@ -71,15 +72,15 @@ typedef enum EffectType : int
 flag-functions for interactivity, play-preview and whether the effect can run without a GUI.
 
 *******************************************************************************************/
-class AUDACITY_DLL_API EffectDefinitionInterface  /* not final */ : public ComponentInterface
+class COMPONENTS_API EffectDefinitionInterface  /* not final */ : public ComponentInterface
 {
 public:
-   virtual ~EffectDefinitionInterface() {};
+   virtual ~EffectDefinitionInterface();
 
    // Type determines how it behaves.
    virtual EffectType GetType() = 0;
    // Classification determines which menu it appears in.
-   virtual EffectType GetClassification() { return GetType();};
+   virtual EffectType GetClassification() { return GetType();}
 
    virtual EffectFamilySymbol GetFamily() = 0;
 
@@ -116,10 +117,10 @@ virtual (abstract) functions to get presets and actually apply the effect.  It u
 ConfigClientInterface to add Getters/setters for private and shared configs. 
 
 *******************************************************************************************/
-class AUDACITY_DLL_API EffectHostInterface  /* not final */ : public ConfigClientInterface
+class COMPONENTS_API EffectHostInterface  /* not final */ : public ConfigClientInterface
 {
 public:
-   virtual ~EffectHostInterface() {};
+   virtual ~EffectHostInterface();
 
    virtual double GetDefaultDuration() = 0;
    virtual double GetDuration() = 0;
@@ -132,6 +133,45 @@ public:
    virtual RegistryPath GetFactoryDefaultsGroup() = 0;
 };
 
+class sampleCount;
+
+// ----------------------------------------------------------------------------
+// Supported channel assignments
+// ----------------------------------------------------------------------------
+
+typedef enum
+{
+   // Use to mark end of list
+   ChannelNameEOL = -1,
+   // The default channel assignment
+   ChannelNameMono,
+   // From this point, the channels follow the 22.2 surround sound format
+   ChannelNameFrontLeft,
+   ChannelNameFrontRight,
+   ChannelNameFrontCenter,
+   ChannelNameLowFrequency1,
+   ChannelNameBackLeft,
+   ChannelNameBackRight,
+   ChannelNameFrontLeftCenter,
+   ChannelNameFrontRightCenter,
+   ChannelNameBackCenter,
+   ChannelNameLowFrequency2,
+   ChannelNameSideLeft,
+   ChannelNameSideRight,
+   ChannelNameTopFrontLeft,
+   ChannelNameTopFrontRight,
+   ChannelNameTopFrontCenter,
+   ChannelNameTopCenter,
+   ChannelNameTopBackLeft,
+   ChannelNameTopBackRight,
+   ChannelNameTopSideLeft,
+   ChannelNameTopSideRight,
+   ChannelNameTopBackCenter,
+   ChannelNameBottomFrontCenter,
+   ChannelNameBottomFrontLeft,
+   ChannelNameBottomFrontRight,
+} ChannelName, *ChannelNames;
+
 /*************************************************************************************//**
 
 \class EffectClientInterface 
@@ -141,7 +181,7 @@ Effect into a plug-in command.  It has functions for realtime that are not part
 AudacityCommand.
 
 *******************************************************************************************/
-class AUDACITY_DLL_API EffectClientInterface  /* not final */ : public EffectDefinitionInterface
+class COMPONENTS_API EffectClientInterface  /* not final */ : public EffectDefinitionInterface
 {
 public:
    using EffectDialogFactory = std::function<
@@ -149,7 +189,7 @@ public:
          EffectHostInterface*, EffectUIClientInterface* )
    >;
 
-   virtual ~EffectClientInterface() {};
+   virtual ~EffectClientInterface();
 
    virtual bool SetHost(EffectHostInterface *host) = 0;
 
@@ -213,10 +253,10 @@ can call SetHostUI passing in a pointer to an EffectUIHostInterface.  It contain
 functionality and is provided, apparently, for type checking.  Since only EffectUIHost
 uses it, EffectUIHost could be used instead.
 *******************************************************************************************/
-class AUDACITY_DLL_API EffectUIHostInterface
+class COMPONENTS_API EffectUIHostInterface
 {
 public:
-   virtual ~EffectUIHostInterface() {};
+   virtual ~EffectUIHostInterface();
 };
 
 /*************************************************************************************//**
@@ -227,10 +267,10 @@ public:
 values.  It can import and export presets.
 
 *******************************************************************************************/
-class AUDACITY_DLL_API EffectUIClientInterface /* not final */
+class COMPONENTS_API EffectUIClientInterface /* not final */
 {
 public:
-   virtual ~EffectUIClientInterface() {};
+   virtual ~EffectUIClientInterface();
 
    virtual void SetHostUI(EffectUIHostInterface *host) = 0;
    virtual bool IsGraphicalUI() = 0;
diff --git a/libraries/lib-components/ModuleInterface.cpp b/libraries/lib-components/ModuleInterface.cpp
new file mode 100644
index 000000000..cc4b0bc67
--- /dev/null
+++ b/libraries/lib-components/ModuleInterface.cpp
@@ -0,0 +1,10 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  @file ModuleInterface.cpp
+
+**********************************************************************/
+#include "ModuleInterface.h"
+
+ModuleInterface::~ModuleInterface() = default;
diff --git a/include/audacity/ModuleInterface.h b/libraries/lib-components/ModuleInterface.h
similarity index 97%
rename from include/audacity/ModuleInterface.h
rename to libraries/lib-components/ModuleInterface.h
index 5280c70f1..da59e47b0 100644
--- a/include/audacity/ModuleInterface.h
+++ b/libraries/lib-components/ModuleInterface.h
@@ -45,8 +45,8 @@
 #include <functional>
 #include <memory>
 #include "Identifier.h"
-#include "audacity/ComponentInterface.h"
-#include "audacity/PluginInterface.h"
+#include "ComponentInterface.h"
+#include "PluginInterface.h"
 
 // ============================================================================
 //
@@ -65,10 +65,11 @@
 ///
 // ============================================================================
 
-class ModuleInterface  /* not final */ : public ComponentInterface
+class COMPONENTS_API ModuleInterface  /* not final */
+   : public ComponentInterface
 {
 public:
-   virtual ~ModuleInterface() {};
+   virtual ~ModuleInterface();
 
    // Called immediately after creation to give the instance a chance to
    // initialize.  Return "true" if initialziation was successful.
diff --git a/libraries/lib-components/PluginInterface.cpp b/libraries/lib-components/PluginInterface.cpp
new file mode 100644
index 000000000..f8710b396
--- /dev/null
+++ b/libraries/lib-components/PluginInterface.cpp
@@ -0,0 +1,10 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  @file PluginInterface.cpp
+
+**********************************************************************/
+#include "PluginInterface.h"
+
+PluginManagerInterface::~PluginManagerInterface() = default;
diff --git a/include/audacity/PluginInterface.h b/libraries/lib-components/PluginInterface.h
similarity index 96%
rename from include/audacity/PluginInterface.h
rename to libraries/lib-components/PluginInterface.h
index 68574732a..d3d5b7629 100644
--- a/include/audacity/PluginInterface.h
+++ b/libraries/lib-components/PluginInterface.h
@@ -42,18 +42,21 @@
 #ifndef __AUDACITY_PLUGININTERFACE_H__
 #define __AUDACITY_PLUGININTERFACE_H__
 
-#include "audacity/ConfigInterface.h"
-#include "audacity/EffectInterface.h"
-#include "audacity/ComponentInterface.h"
-
+#include "ConfigInterface.h"
+#include "EffectInterface.h"
+#include "ComponentInterface.h"
+#include "Identifier.h"
 
 class ModuleInterface;
+using PluginID = wxString;
+using PluginIDs = wxArrayString;
 
-
-class AUDACITY_DLL_API PluginManagerInterface /* not final */
+class COMPONENTS_API PluginManagerInterface /* not final */
 {
 public:
 
+   virtual ~PluginManagerInterface();
+
    static const PluginID &DefaultRegistrationCallback(
       ModuleInterface *provider, ComponentInterface *ident );
    static const PluginID &AudacityCommandRegistrationCallback(
diff --git a/src/BatchCommands.h b/src/BatchCommands.h
index ad9cfb131..79607eb63 100644
--- a/src/BatchCommands.h
+++ b/src/BatchCommands.h
@@ -16,7 +16,7 @@
 
 #include "export/Export.h"
 #include "commands/CommandFlag.h"
-#include "audacity/ComponentInterface.h" // for ComponentInterfaceSymbol
+#include "ComponentInterface.h" // for ComponentInterfaceSymbol
 
 class wxArrayString;
 class Effect;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e645426b1..173add5f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,7 +120,6 @@ list( APPEND SOURCES
       Clipboard.h
       CommonCommandFlags.cpp
       CommonCommandFlags.h
-      ComponentInterfaceSymbol.h
       CrashReport.cpp
       CrashReport.h
       DarkThemeAsCeeCode.h
@@ -1007,13 +1006,7 @@ list( APPEND SOURCES
 #
 #
 list( APPEND HEADERS
-   ../include/audacity/EffectInterface.h
    ../include/audacity/Types.h
-   ../include/audacity/ConfigInterface.h
-   ../include/audacity/ModuleInterface.h
-   ../include/audacity/PluginInterface.h
-   ../include/audacity/ComponentInterface.h
-   ../include/audacity/EffectAutomationParameters.h
 )
 
 #
diff --git a/src/FFmpeg.h b/src/FFmpeg.h
index 4b3a21d43..1f2d1be17 100644
--- a/src/FFmpeg.h
+++ b/src/FFmpeg.h
@@ -18,6 +18,7 @@ Describes shared object that is used to access FFmpeg libraries.
 
 
 
+#include "audacity/Types.h"
 #include "widgets/wxPanelWrapper.h" // to inherit
 
 #if defined(__WXMSW__)
diff --git a/src/LabelDialog.h b/src/LabelDialog.h
index e3d65e82a..c26ad15f8 100644
--- a/src/LabelDialog.h
+++ b/src/LabelDialog.h
@@ -15,7 +15,7 @@
 #include <wx/defs.h>
 
 #include "widgets/wxPanelWrapper.h" // to inherit
-#include "audacity/ComponentInterface.h" // member variable
+#include "ComponentInterface.h" // member variable
 
 class wxArrayString;
 class wxGridEvent;
diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp
index 799dfdfe3..25f75e178 100755
--- a/src/ModuleManager.cpp
+++ b/src/ModuleManager.cpp
@@ -20,7 +20,7 @@ i.e. an alternative to the usual interface, for Audacity.
 
 
 #include "ModuleManager.h"
-#include "audacity/ModuleInterface.h"
+#include "ModuleInterface.h"
 
 
 
@@ -32,7 +32,7 @@ i.e. an alternative to the usual interface, for Audacity.
 #include "FileNames.h"
 #include "MemoryX.h"
 
-#include "audacity/PluginInterface.h"
+#include "PluginInterface.h"
 
 #ifdef EXPERIMENTAL_MODULE_PREFS
 #include "Prefs.h"
diff --git a/src/ModuleManager.h b/src/ModuleManager.h
index 8e6107f2a..8c9db771d 100644
--- a/src/ModuleManager.h
+++ b/src/ModuleManager.h
@@ -66,7 +66,6 @@ using ModuleInterfaceHandle = std::unique_ptr<
 
 typedef std::map<wxString, ModuleInterfaceHandle> ModuleMap;
 typedef std::map<ModuleInterface *, std::unique_ptr<wxDynamicLibrary>> LibraryMap;
-using PluginIDs = wxArrayString;
 
 class AUDACITY_DLL_API ModuleManager final
 {
diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index 86b96a94b..e225a242f 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -28,7 +28,7 @@ for shared and private configs - which need to move out.
 #include <wx/log.h>
 #include <wx/tokenzr.h>
 
-#include "audacity/ModuleInterface.h"
+#include "ModuleInterface.h"
 
 #include "AudacityFileConfig.h"
 #include "Internat.h" // for macro XO
diff --git a/src/PluginManager.h b/src/PluginManager.h
index 4d9b96433..aaa512a4b 100644
--- a/src/PluginManager.h
+++ b/src/PluginManager.h
@@ -17,8 +17,8 @@
 #include <map>
 #include <memory>
 
-#include "audacity/EffectInterface.h"
-#include "audacity/PluginInterface.h"
+#include "EffectInterface.h"
+#include "PluginInterface.h"
 
 class wxArrayString;
 class FileConfig;
diff --git a/src/PluginRegistrationDialog.cpp b/src/PluginRegistrationDialog.cpp
index 1d2d4b21e..3380a008e 100644
--- a/src/PluginRegistrationDialog.cpp
+++ b/src/PluginRegistrationDialog.cpp
@@ -9,7 +9,7 @@
 **********************************************************************/
 #include "PluginRegistrationDialog.h"
 
-#include "audacity/EffectInterface.h"
+#include "EffectInterface.h"
 #include "ModuleManager.h"
 #include "PluginManager.h"
 #include "ShuttleGui.h"
diff --git a/src/Prefs.h b/src/Prefs.h
index 766900f78..29d33cdd4 100644
--- a/src/Prefs.h
+++ b/src/Prefs.h
@@ -38,7 +38,7 @@
 
 #include <functional>
 
-#include "../include/audacity/ComponentInterface.h"
+#include "ComponentInterface.h"
 #include "ComponentInterfaceSymbol.h"
 #include "wxArrayStringEx.h"
 #include "widgets/FileConfig.h"
diff --git a/src/Resample.cpp b/src/Resample.cpp
index 974854263..0c36953c6 100644
--- a/src/Resample.cpp
+++ b/src/Resample.cpp
@@ -25,7 +25,7 @@
 #include "Resample.h"
 #include "Prefs.h"
 #include "Internat.h"
-#include "../include/audacity/ComponentInterface.h"
+#include "ComponentInterface.h"
 
 #include <soxr.h>
 
diff --git a/src/Shuttle.cpp b/src/Shuttle.cpp
index fe5547cf1..61c5a2a8e 100644
--- a/src/Shuttle.cpp
+++ b/src/Shuttle.cpp
@@ -65,7 +65,7 @@ preferences.
 #include <wx/radiobut.h>
 #include <wx/button.h>
 
-#include "../include/audacity/EffectAutomationParameters.h" // for command automation
+#include "EffectAutomationParameters.h" // for command automation
 
 #include "WrappedType.h"
 //#include "effects/Effect.h"
diff --git a/src/Shuttle.h b/src/Shuttle.h
index 183b84455..73aa64cec 100644
--- a/src/Shuttle.h
+++ b/src/Shuttle.h
@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_SHUTTLE__
 #define __AUDACITY_SHUTTLE__
 
-#include "../include/audacity/ComponentInterface.h"
+#include "ComponentInterface.h"
 #include "ComponentInterfaceSymbol.h"
 
 class ComponentInterfaceSymbol;
diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index 68732513c..2151aff86 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -113,7 +113,7 @@ for registering for changes.
 #include <wx/spinctrl.h>
 #include <wx/stattext.h>
 #include <wx/bmpbuttn.h>
-#include "../include/audacity/ComponentInterface.h"
+#include "ComponentInterface.h"
 #include "widgets/ReadOnlyText.h"
 #include "widgets/wxPanelWrapper.h"
 #include "widgets/wxTextCtrlWrapper.h"
diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h
index c66a5f21e..51c7e9d5a 100644
--- a/src/ShuttleGui.h
+++ b/src/ShuttleGui.h
@@ -24,6 +24,7 @@
 
 #include "Prefs.h"
 #include "WrappedType.h"
+#include "ComponentInterfaceSymbol.h"
 
 class ChoiceSetting;
 
@@ -746,8 +747,6 @@ public:
    teShuttleMode GetMode() { return  mShuttleMode; };
 };
 
-class ComponentInterfaceSymbol;
-
 //! Convenience function often useful when adding choice controls
 AUDACITY_DLL_API TranslatableStrings Msgids(
    const EnumValueSymbol strings[], size_t nStrings);
diff --git a/src/TimeDialog.h b/src/TimeDialog.h
index bb3cf25a2..014f44331 100644
--- a/src/TimeDialog.h
+++ b/src/TimeDialog.h
@@ -13,7 +13,7 @@
 
 #include <wx/defs.h>
 
-#include "audacity/ComponentInterface.h" // member variable
+#include "ComponentInterface.h" // member variable
 
 #include "widgets/wxPanelWrapper.h" // to inherit
 
diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp
index aca71e9c7..36d81e6e9 100644
--- a/src/commands/AudacityCommand.cpp
+++ b/src/commands/AudacityCommand.cpp
@@ -35,7 +35,7 @@ ShuttleGui.
 #include <wx/utils.h>
 #include <wx/log.h>
 
-#include "audacity/ConfigInterface.h"
+#include "ConfigInterface.h"
 
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h
index e4327d17d..efca41c85 100644
--- a/src/commands/AudacityCommand.h
+++ b/src/commands/AudacityCommand.h
@@ -20,8 +20,8 @@
 
 #include "../widgets/wxPanelWrapper.h" // to inherit
 
-#include "../include/audacity/ComponentInterface.h"
-#include "../include/audacity/EffectAutomationParameters.h" // for command automation
+#include "ComponentInterface.h"
+#include "EffectAutomationParameters.h" // for command automation
 
 #include "../Registrar.h"
 
diff --git a/src/commands/LoadCommands.h b/src/commands/LoadCommands.h
index b7a0153ce..799a1f96a 100644
--- a/src/commands/LoadCommands.h
+++ b/src/commands/LoadCommands.h
@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_LOAD_COMMANDS__
 #define __AUDACITY_LOAD_COMMANDS__
 
-#include "audacity/ModuleInterface.h"
+#include "ModuleInterface.h"
 
 #include <functional>
 #include <memory>
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index 08508c89f..f368f7330 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -25,8 +25,8 @@ class wxChoice;
 class wxListBox;
 class wxWindow;
 
-#include "audacity/ConfigInterface.h"
-#include "audacity/EffectInterface.h"
+#include "ConfigInterface.h"
+#include "EffectInterface.h"
 
 #include "../SelectedRegion.h"
 
diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h
index d51872f9c..3b62828f2 100644
--- a/src/effects/EffectManager.h
+++ b/src/effects/EffectManager.h
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include <unordered_map>
-#include "audacity/EffectInterface.h"
+#include "EffectInterface.h"
 #include "Identifier.h"
 
 class AudacityCommand;
diff --git a/src/effects/EffectUI.h b/src/effects/EffectUI.h
index 7d7050e3b..b42a05001 100644
--- a/src/effects/EffectUI.h
+++ b/src/effects/EffectUI.h
@@ -16,6 +16,9 @@
 
 #include <wx/bitmap.h> // member variables
 
+#include "Identifier.h"
+#include "PluginInterface.h"
+
 #if defined(EXPERIMENTAL_EFFECTS_RACK)
 
 #include <vector>
@@ -102,8 +105,8 @@ private:
 
 #endif
 
-#include "audacity/EffectInterface.h"
-#include "../widgets/wxPanelWrapper.h" // to inherit
+#include "EffectInterface.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 
 #include "../SelectedRegion.h"
 
diff --git a/src/effects/LoadEffects.h b/src/effects/LoadEffects.h
index f0323f250..c459395ac 100644
--- a/src/effects/LoadEffects.h
+++ b/src/effects/LoadEffects.h
@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_LOAD_EFFECTS__
 #define __AUDACITY_LOAD_EFFECTS__
 
-#include "audacity/ModuleInterface.h"
+#include "ModuleInterface.h"
 
 #include <functional>
 #include <memory>
diff --git a/src/effects/RealtimeEffectManager.cpp b/src/effects/RealtimeEffectManager.cpp
index b20a6a17f..26ae8850f 100644
--- a/src/effects/RealtimeEffectManager.cpp
+++ b/src/effects/RealtimeEffectManager.cpp
@@ -11,7 +11,7 @@
 
 #include "RealtimeEffectManager.h"
 
-#include "audacity/EffectInterface.h"
+#include "EffectInterface.h"
 #include <memory>
 
 #include <atomic>
diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp
index 20a2f30c4..1f90145a8 100644
--- a/src/effects/VST/VSTEffect.cpp
+++ b/src/effects/VST/VSTEffect.cpp
@@ -94,7 +94,7 @@
 #include "../../widgets/WindowAccessible.h"
 #endif
 
-#include "audacity/ConfigInterface.h"
+#include "ConfigInterface.h"
 
 #include <cstring>
 
diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h
index 6856773c6..f3ef7404a 100644
--- a/src/effects/VST/VSTEffect.h
+++ b/src/effects/VST/VSTEffect.h
@@ -12,9 +12,9 @@
 
 #if USE_VST
 
-#include "audacity/EffectInterface.h"
-#include "audacity/ModuleInterface.h"
-#include "audacity/PluginInterface.h"
+#include "EffectInterface.h"
+#include "ModuleInterface.h"
+#include "PluginInterface.h"
 
 #include "../../SampleFormat.h"
 #include "../../xml/XMLTagHandler.h"
diff --git a/src/effects/audiounits/AudioUnitEffect.h b/src/effects/audiounits/AudioUnitEffect.h
index bc31786dc..119b264ec 100644
--- a/src/effects/audiounits/AudioUnitEffect.h
+++ b/src/effects/audiounits/AudioUnitEffect.h
@@ -21,9 +21,9 @@
 #include <AudioUnit/AudioUnit.h>
 #include <AudioUnit/AudioUnitProperties.h>
 
-#include "audacity/EffectInterface.h"
-#include "audacity/ModuleInterface.h"
-#include "audacity/PluginInterface.h"
+#include "EffectInterface.h"
+#include "ModuleInterface.h"
+#include "PluginInterface.h"
 
 #include "AUControl.h"
 
diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h
index 9971f69eb..ebd001e70 100644
--- a/src/effects/ladspa/LadspaEffect.h
+++ b/src/effects/ladspa/LadspaEffect.h
@@ -18,9 +18,9 @@ class NumericTextCtrl;
 #include <wx/dynlib.h> // member variable
 #include <wx/event.h> // to inherit
 
-#include "audacity/EffectInterface.h"
-#include "audacity/ModuleInterface.h"
-#include "audacity/PluginInterface.h"
+#include "EffectInterface.h"
+#include "ModuleInterface.h"
+#include "PluginInterface.h"
 
 #include "ladspa.h"
 #include "../../SampleFormat.h"
diff --git a/src/effects/lv2/LoadLV2.h b/src/effects/lv2/LoadLV2.h
index a214ea0fd..f42b1db1e 100755
--- a/src/effects/lv2/LoadLV2.h
+++ b/src/effects/lv2/LoadLV2.h
@@ -31,9 +31,9 @@
 #include "lv2/uri-map/uri-map.h"
 #include "lv2/units/units.h"
 
-#include "audacity/ModuleInterface.h"
-#include "audacity/EffectInterface.h"
-#include "audacity/PluginInterface.h"
+#include "ModuleInterface.h"
+#include "EffectInterface.h"
+#include "PluginInterface.h"
 
 #include "lv2_external_ui.h"
 
diff --git a/src/effects/nyquist/LoadNyquist.h b/src/effects/nyquist/LoadNyquist.h
index 9220d063e..a6f049daa 100644
--- a/src/effects/nyquist/LoadNyquist.h
+++ b/src/effects/nyquist/LoadNyquist.h
@@ -8,9 +8,9 @@
 
 **********************************************************************/
 
-#include "audacity/ModuleInterface.h"
-#include "audacity/EffectInterface.h"
-#include "audacity/PluginInterface.h"
+#include "ModuleInterface.h"
+#include "EffectInterface.h"
+#include "PluginInterface.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 //
diff --git a/src/effects/vamp/LoadVamp.h b/src/effects/vamp/LoadVamp.h
index 285f0f022..26bcbe113 100644
--- a/src/effects/vamp/LoadVamp.h
+++ b/src/effects/vamp/LoadVamp.h
@@ -14,9 +14,9 @@
 
 #include <memory>
 
-#include "audacity/ModuleInterface.h"
-#include "audacity/EffectInterface.h"
-#include "audacity/PluginInterface.h"
+#include "ModuleInterface.h"
+#include "EffectInterface.h"
+#include "PluginInterface.h"
 
 #include <vamp-hostsdk/PluginLoader.h>
 
diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp
index 2951b101a..0740fc253 100644
--- a/src/menus/ViewMenus.cpp
+++ b/src/menus/ViewMenus.cpp
@@ -1,5 +1,3 @@
-
-
 #include "../CommonCommandFlags.h"
 #include "../Menus.h"
 #include "../Prefs.h"
diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h
index dd0663918..1be4099c5 100644
--- a/src/prefs/PrefsPanel.h
+++ b/src/prefs/PrefsPanel.h
@@ -29,7 +29,7 @@ MousePrefs, QualityPrefs, SpectrumPrefs and ThemePrefs.
 
 #include <functional>
 #include "../widgets/wxPanelWrapper.h" // to inherit
-#include "../include/audacity/ComponentInterface.h"
+#include "ComponentInterface.h"
 #include "../Registry.h"
 
 /* A few constants for an attempt at semi-uniformity */
diff --git a/src/prefs/QualitySettings.h b/src/prefs/QualitySettings.h
index 394090fe3..fb5431160 100644
--- a/src/prefs/QualitySettings.h
+++ b/src/prefs/QualitySettings.h
@@ -11,6 +11,7 @@
 #ifndef __AUDACITY_QUALITY_SETTINGS__
 #define __AUDACITY_QUALITY_SETTINGS__
 
+#include <audacity/Types.h>
 #include "Prefs.h" // for EnumSetting
 
 class IntSetting;
diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h
index 3f862a1de..6d10226df 100644
--- a/src/toolbars/TranscriptionToolBar.h
+++ b/src/toolbars/TranscriptionToolBar.h
@@ -17,7 +17,7 @@
 
 #include <wx/brush.h> // member variable
 
-#include "Identifier.h"
+#include "audacity/Types.h"
 
 class wxChoice;
 class wxCommandEvent;
diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h
index 0b8ecfe6f..821388a20 100644
--- a/src/tracks/ui/TimeShiftHandle.h
+++ b/src/tracks/ui/TimeShiftHandle.h
@@ -13,6 +13,7 @@ Paul Licameli
 
 #include <functional>
 #include <unordered_map>
+#include <vector>
 
 #include "../../AttachedVirtualFunction.h"
 #include "../../UIHandle.h"
diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp
index 061966d52..4c8937a0b 100644
--- a/src/widgets/NumericTextCtrl.cpp
+++ b/src/widgets/NumericTextCtrl.cpp
@@ -168,7 +168,7 @@ different formats.
 
 #include "NumericTextCtrl.h"
 
-#include "Identifier.h"
+#include "audacity/Types.h"
 #include "../AllThemeResources.h"
 #include "../AColor.h"
 #include "../KeyboardCapture.h"
diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h
index 41544c443..7b966fae8 100644
--- a/src/widgets/NumericTextCtrl.h
+++ b/src/widgets/NumericTextCtrl.h
@@ -17,8 +17,8 @@
 
 
 
-#include <memory>
-#include "../../include/audacity/ComponentInterface.h"
+#include "MemoryX.h"
+#include "ComponentInterface.h"
 #include "ComponentInterfaceSymbol.h"
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
diff --git a/src/xml/XMLTagHandler.cpp b/src/xml/XMLTagHandler.cpp
index 33a1cafd6..8e32f1773 100644
--- a/src/xml/XMLTagHandler.cpp
+++ b/src/xml/XMLTagHandler.cpp
@@ -29,6 +29,7 @@
    #include <wx/msw/winundef.h>
 #endif
 
+#include "audacity/Types.h"
 #include <wx/defs.h>
 #include <wx/arrstr.h>
 #include <wx/filename.h>