-#include "imagemagick_decoder.h"
-#include "film.h"
-#include "sndfile_decoder.h"
-#include "decoder_factory.h"
-
-using std::string;
-using std::pair;
-using std::make_pair;
+#include "dcp_content.h"
+#include "dcp_decoder.h"
+#include "image_content.h"
+#include "image_decoder.h"
+#include "string_text_file_content.h"
+#include "string_text_file_decoder.h"
+#include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
+#include "video_mxf_content.h"
+#include "video_mxf_decoder.h"
+#include <boost/foreach.hpp>
+
+using std::list;