Tidying.

diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index b2513b72e4515172ed44414722eab9783206032c..fae7752cf47e59eab272e84a39c4f11e9a101c26 100644 (file)
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -46,14 +46,12 @@
 #include "i18n.h"
 
 
-using std::list;
 using std::cout;
 using std::exception;
 using std::shared_ptr;
 using std::weak_ptr;
 using std::make_shared;
 using boost::optional;
-using dcp::Data;
 using namespace dcpomatic;
 
 

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index fdb3217527ae66d7982277d43ed28f554336a7d4..2139eee3d5c174c254cb0368952dfa6ccd40a4da 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -28,17 +28,15 @@
  */
 
 
-#include "util.h"
 #include "cross.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include "j2k_encoder_cpu_backend.h"
-#include "j2k_encoder_remote_backend.h"
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread.hpp>
+#include "util.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
 #include <list>
 #include <stdint.h>