Tidy up some includes / forward declarations.

diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index cb913f58db5a2b2b0bb0143ec7b06deffe0e1089..da2fd78de97cb0d512d51109c934cbc03ddca412 100644 (file)
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -22,6 +22,7 @@
 
 #include "../config.h"
 #include "../dcp_video.h"
+#include "../film.h"
 #include "../log.h"
 #include "../dcpomatic_log.h"
 #include "../writer.h"

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 433a0498f6e32b8f56c80fd66c9844cab1fbca55..840602dbbfa668629fe347f52431663bb2f223b6 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -27,10 +27,9 @@
  *  @brief J2KEncoder class.
  */
 
-#include "grok/context.h"
 
+#include "grok/context.h"
 #include "cross.h"
-#include "dcp_video.h"
 #include "enum_indexed_vector.h"
 #include "event_history.h"
 #include "exception_store.h"
@@ -43,6 +42,8 @@
 #include <list>
 #include <stdint.h>
 
+
+class DCPVideo;
 class EncodeServerDescription;
 class Film;
 class Job;