diff --git a/src/Experimental.h b/src/Experimental.h
index c64d748a0..c40d309ff 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -151,13 +151,7 @@
 // USE_MIDI must be defined in order for EXPERIMENTAL_SCOREALIGN to work
 //#define EXPERIMENTAL_SCOREALIGN
 
-//If you want any of these files, ask JKC.  They are not
-//yet checked in to Audacity SVN as of 12-Feb-2010
-#ifdef EXPERIMENTAL_NOTEBOOK
-   #include "widgets/GuiFactory.h"
-   #include "widgets/APanel.h"
-   extern void AddPages(   AudacityProject * pProj, GuiFactory & Factory,  wxNotebook  * pNotebook );
-#endif
+//#define EXPERIMENTAL_NOTEBOOK
 
 #ifdef EXPERIMENTAL_NYQUIST_INSPECTOR
    #include "NyquistAdapter.h"
diff --git a/src/ProjectManager.cpp b/src/ProjectManager.cpp
index 5e6c48662..36944c8fe 100644
--- a/src/ProjectManager.cpp
+++ b/src/ProjectManager.cpp
@@ -350,6 +350,10 @@ private:
 
 #endif
 
+#ifdef EXPERIMENTAL_NOTEBOOK
+   extern void AddPages(   AudacityProject * pProj, GuiFactory & Factory,  wxNotebook  * pNotebook );
+#endif
+
 void InitProjectWindow( ProjectWindow &window )
 {
    auto &project = window.GetProject();
diff --git a/src/ProjectWindow.cpp b/src/ProjectWindow.cpp
index 78e68c42a..51cd037bb 100644
--- a/src/ProjectWindow.cpp
+++ b/src/ProjectWindow.cpp
@@ -566,6 +566,13 @@ enum {
    NextID,
 };
 
+//If you want any of these files, ask JKC.  They are not
+//yet checked in to Audacity SVN as of 12-Feb-2010
+#ifdef EXPERIMENTAL_NOTEBOOK
+   #include "GuiFactory.h"
+   #include "APanel.h"
+#endif
+
 ProjectWindow::ProjectWindow(wxWindow * parent, wxWindowID id,
                                  const wxPoint & pos,
                                  const wxSize & size, AudacityProject &project)