Still more build fixes.

5 files changed, 26 insertions, 7 deletions

diff --git a/src/mono_picture_asset_reader.h b/src/mono_picture_asset_reader.h
index 9ec899cc..4caf80f9 100644
--- a/src/mono_picture_asset_reader.h
+++ b/src/mono_picture_asset_reader.h
@@ -31,12 +31,16 @@
     files in the program, then also delete it here.
 */
 
+#ifndef LIBDCP_MONO_PICTURE_ASSET_READER_H
+#define LIBDCP_MONO_PICTURE_ASSET_READER_H
+
 #include "asset_reader.h"
+#include "mono_picture_frame.h"
 
 namespace dcp {
 
-class MonoPictureFrame;
-
 typedef AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame> MonoPictureAssetReader;
 
 }
+
+#endif
diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index fa4f649b..ed42b99f 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -31,12 +31,15 @@
     files in the program, then also delete it here.
 */
 
+#ifndef LIBDCP_MONO_PICTURE_FRAME_H
+#define LIBDCP_MONO_PICTURE_FRAME_H
+
 /** @file  src/mono_picture_frame.h
  *  @brief MonoPictureFrame class.
  */
 
 #include "types.h"
-#include "mono_picture_asset_reader.h"
+#include "asset_reader.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
@@ -77,7 +80,7 @@ private:
 	/* XXX: this is a bit of a shame, but I tried friend MonoPictureAssetReader and it's
 	   rejected by some (seemingly older) GCCs.
 	*/
-	friend class AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame>;
+	friend AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame>;
 
 	MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, boost::shared_ptr<DecryptionContext>);
 
@@ -85,3 +88,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/src/sound_asset_reader.h b/src/sound_asset_reader.h
index 41d50257..8ec4e59f 100644
--- a/src/sound_asset_reader.h
+++ b/src/sound_asset_reader.h
@@ -32,6 +32,7 @@
 */
 
 #include "asset_reader.h"
+#include "sound_frame.h"
 
 namespace dcp {
 
diff --git a/src/stereo_picture_asset_reader.h b/src/stereo_picture_asset_reader.h
index 43b9d225..f82443e7 100644
--- a/src/stereo_picture_asset_reader.h
+++ b/src/stereo_picture_asset_reader.h
@@ -31,12 +31,16 @@
     files in the program, then also delete it here.
 */
 
+#ifndef LIBDCP_STEREO_PICTURE_ASSET_READER_H
+#define LIBDCP_STEREO_PICTURE_ASSET_READER_H
+
 #include "asset_reader.h"
+#include "stereo_picture_frame.h"
 
 namespace dcp {
 
-class StereoPictureFrame;
-
 typedef AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame> StereoPictureAssetReader;
 
 }
+
+#endif
diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 14c94e2e..187940af 100644
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -31,8 +31,11 @@
     files in the program, then also delete it here.
 */
 
+#ifndef LIBDCP_STEREO_PICTURE_FRAME_H
+#define LIBDCP_STEREO_PICTURE_FRAME_H
+
 #include "types.h"
-#include "stereo_picture_asset_reader.h"
+#include "asset_reader.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
@@ -81,3 +84,5 @@ private:
 };
 
 }
+
+#endif