-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
-#include "sound_mxf.h"
-#include "subtitle_content.h"
-#include "argb_frame.h"
+#include "mono_picture_asset.h"
+#include "mono_picture_asset_reader.h"
+#include "stereo_picture_asset.h"
+#include "sound_asset.h"
+#include "subtitle_asset.h"
+#include "openjpeg_image.h"
+#include "colour_conversion.h"
+#include "rgb_xyz.h"
+/* This DISABLE/ENABLE pair is just to ignore some warnings from Magick++.h; they
+ * can be removed.
+ */
+LIBDCP_DISABLE_WARNINGS