From 2a91f91287274a40cfe989a15f37f917f5c4311e Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 26 May 2020 15:24:00 -0400
Subject: [PATCH] Revert "Break cycle of FileDialog and FileDialogPrivate"...

... It didn't really break the cycle, because there were still indirect
inclusions via AudacityHeaders.h.

This reverts commit 4f78874978975b42a5ca0ffb7175d586875da629.
---
 src/widgets/FileDialog/gtk/FileDialogPrivate.cpp | 2 ++
 src/widgets/FileDialog/mac/FileDialogPrivate.h   | 2 ++
 src/widgets/FileDialog/mac/FileDialogPrivate.mm  | 2 ++
 src/widgets/FileDialog/win/FileDialogPrivate.cpp | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp b/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp
index cd49ba8db..a1054efc1 100644
--- a/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp
+++ b/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp
@@ -11,6 +11,8 @@
 
 #include <gtk/gtk.h>
 
+#include "../FileDialog.h"
+
 #include "wx/intl.h"
 #include "wx/msgdlg.h"
 
diff --git a/src/widgets/FileDialog/mac/FileDialogPrivate.h b/src/widgets/FileDialog/mac/FileDialogPrivate.h
index cd2346cec..7fe79111c 100644
--- a/src/widgets/FileDialog/mac/FileDialogPrivate.h
+++ b/src/widgets/FileDialog/mac/FileDialogPrivate.h
@@ -14,6 +14,8 @@
 #ifndef _MAC_FILEDIALOG_H_
 #define _MAC_FILEDIALOG_H_
 
+#include "../FileDialog.h"
+
 class wxChoice;
 
 //-------------------------------------------------------------------------
diff --git a/src/widgets/FileDialog/mac/FileDialogPrivate.mm b/src/widgets/FileDialog/mac/FileDialogPrivate.mm
index 1d59b0012..55ee44dbf 100644
--- a/src/widgets/FileDialog/mac/FileDialogPrivate.mm
+++ b/src/widgets/FileDialog/mac/FileDialogPrivate.mm
@@ -24,6 +24,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include <wx/wxprec.h>
 
+#include "../FileDialog.h"
+
 #ifndef WX_PRECOMP
     #include <wx/msgdlg.h>
     #include <wx/app.h>
diff --git a/src/widgets/FileDialog/win/FileDialogPrivate.cpp b/src/widgets/FileDialog/win/FileDialogPrivate.cpp
index 07064bb2f..0f95a7c9e 100644
--- a/src/widgets/FileDialog/win/FileDialogPrivate.cpp
+++ b/src/widgets/FileDialog/win/FileDialogPrivate.cpp
@@ -49,6 +49,8 @@
 #include <wx/modalhook.h>
 #include <wx/filectrl.h>
 
+#include "../FileDialog.h"
+
 #include <shlobj.h>
 
 // ----------------------------------------------------------------------------