Include order tweaks.

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 67e1a99515527b3b3dc7a0d6dcaf4942d2b0328e..300800697e09ec4f9006d6c4acd35df0852ac401 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -17,24 +17,24 @@
 
 */
 
-#include <wx/treectrl.h>
-#include <wx/datectrl.h>
-#include <wx/timectrl.h>
-#include <wx/stdpaths.h>
-#include <wx/listctrl.h>
-#include <libcxml/cxml.h>
-#include "lib/cinema.h"
-#include "lib/config.h"
-#include "lib/film.h"
 #include "kdm_dialog.h"
 #include "cinema_dialog.h"
 #include "screen_dialog.h"
 #include "wx_util.h"
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
+#include "lib/cinema.h"
+#include "lib/config.h"
+#include "lib/film.h"
+#include <libcxml/cxml.h>
 #else
 #include <wx/filepicker.h>
 #endif
+#include <wx/treectrl.h>
+#include <wx/datectrl.h>
+#include <wx/timectrl.h>
+#include <wx/stdpaths.h>
+#include <wx/listctrl.h>
 
 using std::string;
 using std::map;

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 1cf4ddde8a3b1f569bca6618cc9d314c77c4a9d7..48681a92e20f38893ab64d1926f02a349137a783 100644 (file)
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -17,12 +17,13 @@
 
 */
 
-#include <map>
-#include <boost/shared_ptr.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include "wx_util.h"
+#include <dcp/types.h>
 #include <wx/wx.h>
 #include <wx/treectrl.h>
-#include "wx_util.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <map>
 
 class wxTreeCtrl;
 class wxDatePickerCtrl;
@@ -32,6 +33,8 @@ class DirPickerCtrl;
 
 class Cinema;
 class Screen;
+class Film;
+class CPLSummary;
 
 class KDMDialog : public wxDialog
 {