Audacity.h has shrunk to nothing, now remove it!

modules/mod-null/ModNullCallback.cpp

@@ -27,7 +27,7 @@ click from the menu into the actual function to be called.
 
 #include <wx/wx.h>
 #include "ModNullCallback.h"
-#include "Audacity.h"
+
 #include "ModuleManager.h"
 #include "ShuttleGui.h"
 #include "Project.h"

modules/mod-nyq-bench/NyqBench.cpp

@@ -6,7 +6,7 @@
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 
 #include <wx/defs.h>
 

modules/mod-script-pipe/ScripterCallback.cpp

@@ -15,7 +15,6 @@
 
 #include <wx/wx.h>
 #include "ScripterCallback.h"
-#include "../../src/Audacity.h"
 
 /*
 There are several functions that can be used in a GUI module.

src/AColor.cpp

@@ -17,7 +17,7 @@ It is also a place to document colour usage policy in Audacity
 
 *//********************************************************************/
 
-#include "Audacity.h"
+
 #include "AColor.h"
 
 

src/AboutDialog.cpp

@@ -25,7 +25,7 @@ hold information about one contributor to Audacity.
 *//********************************************************************/
 
 
-#include "Audacity.h" // for USE_* macros
+
 #include "AboutDialog.h"
 
 

src/ActiveProjects.cpp

@@ -11,7 +11,7 @@
 
 *//********************************************************************/
 
-#include "Audacity.h"
+
 #include "ActiveProjects.h"
 #include "Prefs.h"
 

src/ActiveProjects.h

@@ -9,7 +9,7 @@
 #ifndef __AUDACITY_ACTIVE_PROJECTS__
 #define __AUDACITY_ACTIVE_PROJECTS__
 
-#include "Audacity.h"
+
 #include "audacity/Types.h"
 
 #include <wx/string.h>

src/AdornedRulerPanel.cpp

@@ -18,7 +18,7 @@
 
 *//******************************************************************/
 
-#include "Audacity.h"
+
 #include "AdornedRulerPanel.h"
 
 

src/AllThemeResources.h

@@ -44,7 +44,7 @@ from there.  Audacity will look for a file called "Pause.png".
 // Note: No '#ifndef/#define' pair on this header file.
 // we want to include it multiple times in Theme.cpp.
 
-#include "Audacity.h"
+
 
 
 #include "MacroMagic.h"

src/Audacity.h

@@ -1,26 +0,0 @@
-/**********************************************************************
-
-   Audacity: A Digital Audio Editor
-   Audacity(R) is copyright (c) 1999-2015 Audacity Team.
-   License: GPL v2.  See License.txt.
-
-   Audacity.h
-
-   Dominic Mazzoni
-   Joshua Haberman
-   Vaughan Johnson
-   et alii
-
-********************************************************************//*!
-
-\file Audacity.h
-
-  This is the main include file for Audacity.  All files which need
-  any Audacity-specific \#defines or need to access any of Audacity's
-  global functions should \#include this file.
-
-*//********************************************************************/
-
-#ifndef __AUDACITY_H__
-#define __AUDACITY_H__
-#endif // __AUDACITY_H__

src/AudacityApp.cpp

@@ -15,7 +15,7 @@ It handles initialization and termination by subclassing wxApp.
 
 *//*******************************************************************/
 
-#include "Audacity.h" // This should always be included first; for USE_* macros and __UNIX__
+
 #include "AudacityApp.h"
 
 

src/AudacityApp.h

@@ -14,7 +14,7 @@
 #ifndef __AUDACITY_APP__
 #define __AUDACITY_APP__
 
-#include "Audacity.h"
+
 #include "audacity/Types.h"
 
 

src/AudacityException.cpp

@@ -9,7 +9,7 @@
 
 ***********************************************************************/
 
-#include "Audacity.h"
+
 #include "AudacityException.h"
 
 #include <wx/atomic.h>

src/AudacityFileConfig.cpp

@@ -8,7 +8,7 @@ Paul Licameli split from Prefs.cpp
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 #include "AudacityFileConfig.h"
 
 #include "widgets/HelpSystem.h"

src/AudacityHeaders.h

@@ -17,7 +17,7 @@
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 
 #include <stdio.h>
 #include <stdlib.h>

src/AudacityLogger.cpp

@@ -14,7 +14,7 @@ Provides thread-safe logging based on the wxWidgets log facility.
 *//*******************************************************************/
 
 
-#include "Audacity.h" // This should always be included first
+
 #include "AudacityLogger.h"
 
 

src/AudacityLogger.h

@@ -14,7 +14,7 @@
 #ifndef __AUDACITY_LOGGER__
 #define __AUDACITY_LOGGER__
 
-#include "Audacity.h"
+
 
 
 

src/AudioIO.cpp

@@ -413,7 +413,7 @@ time warp info and AudioIOListener and whether the playback is looped.
 
 *//*******************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 #include "AudioIO.h"
 
 

src/AudioIO.h

@@ -13,7 +13,7 @@
 #ifndef __AUDACITY_AUDIO_IO__
 #define __AUDACITY_AUDIO_IO__
 
-#include "Audacity.h" // for USE_* macros
+
 
 #include "AudioIOBase.h" // to inherit
 

src/AudioIOBase.cpp

@@ -8,7 +8,7 @@ Paul Licameli split from AudioIO.cpp
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 #include "AudioIOBase.h"
 
 

src/AudioIOBase.h

@@ -11,7 +11,7 @@ Paul Licameli split from AudioIO.h
 #ifndef __AUDACITY_AUDIO_IO_BASE__
 #define __AUDACITY_AUDIO_IO_BASE__
 
-#include "Audacity.h" // for USE_* macros
+
 
 
 #include <atomic>

src/AudioIOListener.h

@@ -13,7 +13,7 @@
 #ifndef __AUDACITY_AUDIO_IO_LISTENER__
 #define __AUDACITY_AUDIO_IO_LISTENER__
 
-#include "Audacity.h"
+
 
 class WaveTrack;
 using WaveTrackArray =

src/BatchCommandDialog.cpp

@@ -18,7 +18,7 @@ selected command.
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "BatchCommandDialog.h"
 
 #ifdef __WXMSW__

src/BatchCommands.cpp

@@ -17,7 +17,7 @@ processing.  See also MacrosWindow and ApplyMacroDialog.
 
 #define wxLOG_COMPONENT "MacroCommands"
 
-#include "Audacity.h" // for USE_* macros
+
 #include "BatchCommands.h"
 
 #include <wx/defs.h>

src/BatchProcessDialog.cpp

@@ -14,7 +14,7 @@
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "BatchProcessDialog.h"
 
 #include <wx/setup.h> // for wxUSE_* macros

src/Benchmark.cpp

@@ -15,7 +15,7 @@ of sample block storage.
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Benchmark.h"
 
 #include <wx/app.h>

src/CMakeLists.txt

@@ -72,7 +72,6 @@ list( APPEND SOURCES
       AllThemeResources.cpp
       AllThemeResources.h
       AttachedVirtualFunction.h
-      Audacity.h
       AudacityApp.cpp
       AudacityApp.h
       $<$<BOOL:${wxIS_MAC}>:AudacityApp.mm>

src/CellularPanel.cpp

@@ -27,7 +27,7 @@
 
 *//*****************************************************************/
 
-#include "Audacity.h"
+
 #include "CellularPanel.h"
 
 #include <wx/eventfilter.h>

src/Clipboard.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_CLIPBOARD__
 #define __AUDACITY_CLIPBOARD__
 
-#include "Audacity.h"
+
 
 #include <memory>
 #include <wx/event.h> // to inherit wxEvtHandler

src/CommonCommandFlags.cpp

@@ -8,7 +8,7 @@ Paul Licameli split from Menus.cpp
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 #include "CommonCommandFlags.h"
 
 

src/CommonCommandFlags.h

@@ -11,7 +11,7 @@ Paul Licameli split from Menus.cpp
 #ifndef __AUDACITY_COMMON_COMMAND_FLAGS__
 #define __AUDACITY_COMMON_COMMAND_FLAGS__
 
-#include "Audacity.h"
+
 
 #include "commands/CommandFlag.h"
 

src/CrashReport.cpp

@@ -6,7 +6,7 @@
  
  *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "CrashReport.h"
 
 #if defined(HAS_CRASH_REPORT)

src/CrashReport.h

@@ -14,7 +14,7 @@
 
 #undef HAS_CRASH_REPORT
 
-#include "Audacity.h"
+
 
 
 #if defined(EXPERIMENTAL_CRASH_REPORT)

src/DeviceChange.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_DEVICECHANGE_H__
 #define __AUDACITY_DEVICECHANGE_H__
 
-#include "Audacity.h" // for HAVE_LIBUDEV_H
+
 
 
 

src/DeviceManager.cpp

@@ -6,7 +6,7 @@
 
 ******************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 #include "DeviceManager.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".

src/Diags.cpp

@@ -28,7 +28,7 @@ count down so that we track how many times the event happens.
 *//********************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Diags.h"
 
 #include <wx/defs.h>

src/EnvelopeEditor.cpp

@@ -8,7 +8,7 @@
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 #include "EnvelopeEditor.h"
 
 

src/FFT.cpp

@@ -39,7 +39,7 @@
     * 9: Gaussian(a=4.5)
 */
 
-#include "Audacity.h"
+
 #include "FFT.h"
 
 #include "Internat.h"

src/FFmpeg.cpp

@@ -17,7 +17,7 @@ License: GPL v2.  See License.txt.
 // Store function pointers here when including FFmpeg.h
 #define DEFINE_FFMPEG_POINTERS
 
-#include "Audacity.h"   // for config*.h // for USE_* macros
+
 #include "FFmpeg.h"
 
 #include "FileNames.h"

src/FFmpeg.h

@@ -16,7 +16,7 @@ Describes shared object that is used to access FFmpeg libraries.
 #if !defined(__AUDACITY_FFMPEG__)
 #define __AUDACITY_FFMPEG__
 
-#include "Audacity.h" // for USE_* macros
+
 
 #include "widgets/wxPanelWrapper.h" // to inherit
 

src/FileException.cpp

@@ -7,7 +7,7 @@
 
 */
 
-#include "Audacity.h"
+
 #include "FileException.h"
 #include "FileNames.h"
 

src/FileFormats.cpp

@@ -15,7 +15,7 @@ information.
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "FileFormats.h"
 
 #include <wx/arrstr.h>

src/FileFormats.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_FILE_FORMATS__
 #define __AUDACITY_FILE_FORMATS__
 
-#include "Audacity.h" // for __UNIX__
+
 
 #include "audacity/Types.h"
 

src/FileIO.cpp

@@ -8,7 +8,7 @@
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 #include "FileIO.h"
 
 #include <wx/defs.h>

src/FileNames.cpp

@@ -20,7 +20,7 @@ used throughout Audacity into this one place.
 
 *//********************************************************************/
 
-#include "Audacity.h"
+
 #include "FileNames.h"
 
 

src/FileNames.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_FILE_NAMES__
 #define __AUDACITY_FILE_NAMES__
 
-#include "Audacity.h"
+
 
 #include <wx/dir.h> // for wxDIR_FILES
 #include <wx/string.h> // function return value

src/FreqWindow.cpp

@@ -32,7 +32,7 @@ the mouse around.
 */
 
 
-#include "Audacity.h"
+
 #include "FreqWindow.h"
 
 #include <algorithm>

src/HelpText.cpp

@@ -12,7 +12,7 @@
 \brief Given a key, returns some html.
 *//********************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 #include "HelpText.h"
 
 

src/HistoryWindow.cpp

@@ -16,7 +16,7 @@ undo memory so as to free up space.
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "HistoryWindow.h"
 
 #include <wx/app.h>

src/ImageManipulation.cpp

@@ -22,7 +22,7 @@ channel.  This collection of functions fills that gap.
 *//*********************************************************************/
 
 
-#include "Audacity.h" // for USE_* macros
+
 #include "ImageManipulation.h"
 
 #include <wx/image.h>

src/InconsistencyException.cpp

@@ -7,7 +7,7 @@
 
 */
 
-#include "Audacity.h"
+
 #include "InconsistencyException.h"
 
 InconsistencyException::~InconsistencyException()

src/Internat.h

@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_INTERNAT__
 #define __AUDACITY_INTERNAT__
 
-#include "Audacity.h"
+
 
 #include <wx/longlong.h>
 

src/InterpolateAudio.h

@@ -25,7 +25,7 @@
 #ifndef __AUDACITY_INTERPOLATE_AUDIO__
 #define __AUDACITY_INTERPOLATE_AUDIO__
 
-#include "Audacity.h"
+
 #include <cstddef>
 
 // See top of file for a description of the algorithm.  Interpolates

src/KeyboardCapture.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_KEYBOARD_CAPTURE__
 #define __AUDACITY_KEYBOARD_CAPTURE__
 
-#include "Audacity.h"
+
 
 #include <functional>
 #include <wx/event.h>

src/LabelDialog.cpp

@@ -13,7 +13,7 @@
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "LabelDialog.h"
 
 #include <wx/button.h>

src/LabelTrack.cpp

@@ -28,7 +28,7 @@ for drawing different aspects of the label and its text box.
 
 *//*******************************************************************/
 
-#include "Audacity.h" // for HAVE_GTK
+
 #include "LabelTrack.h"
 
 #include "tracks/ui/TrackView.h"

src/LangChoice.cpp

@@ -15,7 +15,7 @@ of languages for Audacity.
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "LangChoice.h"
 
 #include <wx/defs.h>

src/Languages.cpp

@@ -30,7 +30,7 @@
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Languages.h"
 #include "MemoryX.h"
 

src/Legacy.cpp

@@ -26,7 +26,7 @@ On failure the old version is put back in place.
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Legacy.h"
 
 #include <stdio.h>

src/Lyrics.h

@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_LYRICS__
 #define __AUDACITY_LYRICS__
 
-#include "Audacity.h"
+
 
 #include <vector>
 #include <wx/textctrl.h> // to inherit

src/Menus.cpp

@@ -25,7 +25,7 @@
 
 *//*******************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 #include "Menus.h"
 
 

src/Mix.cpp

@@ -21,7 +21,7 @@
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Mix.h"
 
 #include <math.h>

src/MixerBoard.cpp

@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 #include "MixerBoard.h"
 
 

src/MixerBoard.h

@@ -8,7 +8,7 @@
 
 **********************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 
 
 #ifndef __AUDACITY_MIXER_BOARD__

src/ModuleManager.cpp

@@ -18,7 +18,7 @@ i.e. an alternative to the usual interface, for Audacity.
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "ModuleManager.h"
 #include "audacity/ModuleInterface.h"
 

src/NoteTrack.cpp

@@ -14,7 +14,7 @@
 *//*******************************************************************/
 
 
-#include "Audacity.h" // for USE_* macros
+
 #include "NoteTrack.h"
 
 

src/NoteTrack.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_NOTETRACK__
 #define __AUDACITY_NOTETRACK__
 
-#include "Audacity.h" // for USE_* macros
+
 
 
 

src/PitchName.cpp

@@ -17,7 +17,7 @@
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "PitchName.h"
 
 #include <math.h>

src/PluginManager.cpp

@@ -18,7 +18,7 @@ effects, generators, analysis-effects, commands.  It also has functions
 for shared and private configs - which need to move out.
 *****************************************************************************/
 
-#include "Audacity.h"
+
 #include "PluginManager.h"
 
 

src/Prefs.cpp

@@ -50,7 +50,7 @@
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Prefs.h"
 
 #include <wx/defs.h>

src/Prefs.h

@@ -29,7 +29,7 @@
 #ifndef __AUDACITY_PREFS__
 #define __AUDACITY_PREFS__
 
-#include "Audacity.h"
+
 
 // Increment this every time the prefs need to be reset
 // the first part (before the r) indicates the version the reset took place

src/Printing.cpp

@@ -14,7 +14,7 @@
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Printing.h"
 
 #include <wx/defs.h>

src/Profiler.cpp

@@ -20,7 +20,7 @@ but it will probably work fine if you use it on a high level.
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "Profiler.h"
 
 #include <stdio.h>

src/Project.cpp

@@ -9,7 +9,7 @@
 
 *//*******************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 #include "Project.h"
 
 #include "KeyboardCapture.h"

src/Project.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_PROJECT__
 #define __AUDACITY_PROJECT__
 
-#include "Audacity.h"
+
 
 #include "ClientData.h" // to inherit
 

src/ProjectAudioManager.cpp

@@ -8,7 +8,7 @@ Paul Licameli split from ProjectManager.cpp
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 #include "ProjectAudioManager.h"
 
 

src/ProjectSerializer.cpp

@@ -13,7 +13,7 @@
 
 *//********************************************************************/
 
-#include "Audacity.h"
+
 #include "ProjectSerializer.h"
 
 #include <algorithm>

src/RealFFTf.cpp

@@ -36,7 +36,7 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "Audacity.h"
+
 #include "RealFFTf.h"
 
 

src/RealFFTf.h

@@ -1,7 +1,7 @@
 #ifndef __realfftf_h
 #define __realfftf_h
 
-#include "Audacity.h"
+
 
 
 

src/RealFFTf48x.cpp

@@ -54,7 +54,7 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "Audacity.h" // for USE_* macros
+
 #include "RealFFTf48x.h"
 
 

src/Registrar.h

@@ -20,7 +20,7 @@ responsible for calling the appropriate callback functions.
 #ifndef __AUDACITY_REGISTRAR__
 #define __AUDACITY_REGISTRAR__
 
-#include "Audacity.h"
+
 
 #include "MemoryX.h"
 

src/Resample.h

@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_RESAMPLE_H__
 #define __AUDACITY_RESAMPLE_H__
 
-#include "Audacity.h"
+
 
 #include "SampleFormat.h"
 

src/SampleBlock.cpp

@@ -6,7 +6,7 @@ SampleBlock.cpp
 
 **********************************************************************/
 
-#include "Audacity.h"
+
 #include "InconsistencyException.h"
 #include "SampleBlock.h"
 #include "SampleFormat.h"

src/SampleFormat.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_SAMPLE_FORMAT__
 #define __AUDACITY_SAMPLE_FORMAT__
 
-#include "Audacity.h"
+
 
 #include "MemoryX.h"
 #include <wx/defs.h>

src/Screenshot.h

@@ -19,7 +19,7 @@
 #ifndef __AUDACITY_SCREENSHOT__
 #define __AUDACITY_SCREENSHOT__
 
-#include "Audacity.h"
+
 
 #include <wx/defs.h>
 

src/SelectedRegion.h

@@ -25,7 +25,7 @@
 #ifndef __AUDACITY_SELECTEDREGION__
 #define __AUDACITY_SELECTEDREGION__
 
-#include "Audacity.h"
+
 
 
 

src/SelectionState.cpp

@@ -6,7 +6,7 @@
 
  **********************************************************************/
 
-#include "Audacity.h"
+
 #include "SelectionState.h"
 
 #include "ViewInfo.h"

src/Sequence.cpp

@@ -28,7 +28,7 @@
 *//*******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "Sequence.h"
 
 #include <algorithm>

src/Sequence.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_SEQUENCE__
 #define __AUDACITY_SEQUENCE__
 
-#include "Audacity.h"
+
 #include <vector>
 #include <functional>
 

src/Shuttle.cpp

@@ -50,7 +50,7 @@ preferences.
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "Shuttle.h"
 
 #include <wx/defs.h>

src/ShuttleGui.cpp

@@ -93,7 +93,7 @@ for registering for changes.
 *//******************************************************************/
 
 
-#include "Audacity.h"
+
 #include "ShuttleGui.h"
 
 

src/ShuttleGui.h

@@ -14,7 +14,7 @@
 #ifndef SHUTTLE_GUI
 #define SHUTTLE_GUI
 
-#include "Audacity.h"
+
 #include "audacity/Types.h"
 
 #include <vector>

src/ShuttlePrefs.cpp

@@ -24,7 +24,7 @@
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "ShuttlePrefs.h"
 
 #include <wx/defs.h>

src/Snap.cpp

@@ -8,7 +8,7 @@
 
 **********************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+
 #include "Snap.h"
 
 #include <algorithm>

src/SoundActivatedRecord.cpp

@@ -18,7 +18,7 @@
 
 *//********************************************************************/
 
-#include "Audacity.h"
+
 #include "SoundActivatedRecord.h"
 
 #include "ShuttleGui.h"

src/SpectrumAnalyst.cpp

@@ -23,7 +23,7 @@ and in the spectrogram spectral selection.
 */
 
 
-#include "Audacity.h"
+
 #include "SpectrumAnalyst.h"
 #include "FFT.h"
 

src/SplashDialog.cpp

@@ -20,7 +20,7 @@ most commonly asked questions about Audacity.
 *//********************************************************************/
 
 
-#include "Audacity.h"
+
 #include "SplashDialog.h"
 
 

src/Tags.cpp

@@ -30,7 +30,7 @@
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+
 #include "Tags.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".

src/Tags.h

@@ -29,7 +29,7 @@
 #ifndef __AUDACITY_TAGS__
 #define __AUDACITY_TAGS__
 
-#include "Audacity.h"
+
 
 #include "xml/XMLTagHandler.h"
 

src/TempDirectory.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_TEMP_DIRECTORY__
 #define __AUDACITY_TEMP_DIRECTORY__
 
-#include "Audacity.h"
+
 #include "audacity/Types.h"
 
 class wxWindow;