9 files changed, 28 insertions, 25 deletions
diff --git a/macosx/HBAudio.h b/macosx/HBAudio.h
index 5d73830a7..aaaf076ed 100644
--- a/macosx/HBAudio.h
+++ b/macosx/HBAudio.h
@@ -7,7 +7,6 @@
 #import <Foundation/Foundation.h>
 #import "HBPresetCoding.h"
 
-@class HBJob;
 @class HBAudioTrack;
 @class HBAudioDefaults;
 
@@ -17,10 +16,6 @@ extern NSString *HBAudioChangedNotification;
 
 @interface HBAudio : NSObject <NSSecureCoding, NSCopying>
 
-- (instancetype)initWithJob:(HBJob *)job;
-
-@property (nonatomic, readwrite, weak) HBJob *job;
-
 @property (nonatomic, readonly) NSMutableArray<NSDictionary *> *sourceTracks;
 @property (nonatomic, readonly) NSMutableArray<HBAudioTrack *> *tracks;
 
@@ -32,7 +27,6 @@ extern NSString *HBAudioChangedNotification;
 
 - (BOOL)anyCodecMatches:(int)codec;
 
-@property (nonatomic, readwrite) int container;
 @property (nonatomic, readwrite, weak, nullable) NSUndoManager *undo;
 
 @end
diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m
index 6c6bda46c..7d92c5942 100644
--- a/macosx/HBAudio.m
+++ b/macosx/HBAudio.m
@@ -23,6 +23,10 @@
 NSString *HBAudioChangedNotification = @"HBAudioChangedNotification";
 
 @interface HBAudio () <HBAudioTrackDataSource, HBAudioTrackDelegate>
+
+@property (nonatomic, readwrite, weak) HBJob *job;
+@property (nonatomic, readwrite) int container;
+
 @end
 
 @implementation HBAudio
diff --git a/macosx/HBJob+Private.h b/macosx/HBJob+Private.h
index acd78da1f..2479516e6 100644
--- a/macosx/HBJob+Private.h
+++ b/macosx/HBJob+Private.h
@@ -10,12 +10,19 @@
 
 @interface HBVideo (Private)
 
+- (instancetype)initWithJob:(HBJob *)job;
+
+@property (nonatomic, readwrite, weak) HBJob *job;
+
+- (void)containerChanged;
 - (void)applyPreset:(HBPreset *)preset jobSettings:(NSDictionary *)settings;
 
 @end
 
 @interface HBPicture (Private)
 
+- (instancetype)initWithTitle:(HBTitle *)title;
+
 - (void)applyPreset:(HBPreset *)preset jobSettings:(NSDictionary *)settings;
 
 @end
@@ -28,12 +35,22 @@
 
 @interface HBAudio (Private)
 
+- (instancetype)initWithJob:(HBJob *)job;
+
+@property (nonatomic, readwrite, weak) HBJob *job;
+@property (nonatomic, readwrite) int container;
+
 - (void)applyPreset:(HBPreset *)preset jobSettings:(NSDictionary *)settings;
 
 @end
 
 @interface HBSubtitles (Private)
 
+- (instancetype)initWithJob:(HBJob *)job;
+
+@property (nonatomic, readwrite, weak) HBJob *job;
+@property (nonatomic, readwrite) int container;
+
 - (void)applyPreset:(HBPreset *)preset jobSettings:(NSDictionary *)settings;
 
 @end
diff --git a/macosx/HBPicture.h b/macosx/HBPicture.h
index 2b0dc9503..e22f164c5 100644
--- a/macosx/HBPicture.h
+++ b/macosx/HBPicture.h
@@ -25,8 +25,6 @@ extern NSString * const HBPictureChangedNotification;
  */
 @interface HBPicture : NSObject <NSSecureCoding, NSCopying>
 
-- (instancetype)initWithTitle:(HBTitle *)title;
-
 @property (nonatomic, readwrite) int width;
 @property (nonatomic, readwrite) int height;
 
diff --git a/macosx/HBSubtitles.h b/macosx/HBSubtitles.h
index afda6a659..0d5d87a30 100644
--- a/macosx/HBSubtitles.h
+++ b/macosx/HBSubtitles.h
@@ -9,16 +9,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class HBJob;
 @class HBSubtitlesTrack;
 @class HBSubtitlesDefaults;
 
 @interface HBSubtitles : NSObject <NSSecureCoding, NSCopying>
 
-- (instancetype)initWithJob:(HBJob *)job;
-
-@property (nonatomic, readwrite, weak) HBJob *job;
-
 - (void)addAllTracks;
 - (void)removeAll;
 - (void)reloadDefaults;
@@ -30,10 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readwrite, strong) HBSubtitlesDefaults *defaults;
 
-/**
- *  For internal use
- */
-@property (nonatomic, readwrite) int container;
 @property (nonatomic, readwrite, weak, nullable) NSUndoManager *undo;
 
 @end
diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m
index b920623ff..024d30dcf 100644
--- a/macosx/HBSubtitles.m
+++ b/macosx/HBSubtitles.m
@@ -28,6 +28,9 @@ extern NSString *keySubTrackSrtFileURL;
 
 @interface HBSubtitles () <HBTrackDataSource, HBTrackDelegate>
 
+@property (nonatomic, readwrite, weak) HBJob *job;
+@property (nonatomic, readwrite) int container;
+
 /// Used to aovid circular dependecy validation.
 @property (nonatomic, readwrite) BOOL validating;
 
@@ -40,7 +43,7 @@ extern NSString *keySubTrackSrtFileURL;
     self = [super init];
     if (self)
     {
-        _job = job;
+        job = job;
         _container = HB_MUX_MP4;
 
         _sourceTracks = [job.title.subtitlesTracks mutableCopy];
diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m
index 676746b7c..1a07bb810 100644
--- a/macosx/HBVideo+UIAdditions.m
+++ b/macosx/HBVideo+UIAdditions.m
@@ -5,7 +5,7 @@
  It may be used under the terms of the GNU General Public License. */
 
 #import "HBVideo+UIAdditions.h"
-#import "HBJob.h"
+#import "HBJob+Private.h"
 #include "hb.h"
 
 @implementation HBVideo (UIAdditions)
diff --git a/macosx/HBVideo.h b/macosx/HBVideo.h
index 50678ec41..d259f011c 100644
--- a/macosx/HBVideo.h
+++ b/macosx/HBVideo.h
@@ -28,12 +28,6 @@ extern NSString * const HBVideoChangedNotification;
  */
 @interface HBVideo : NSObject <NSSecureCoding, NSCopying>
 
-- (instancetype)initWithJob:(HBJob *)job;
-
-@property (nonatomic, readwrite, weak) HBJob *job;
-
-- (void)containerChanged;
-
 @property (nonatomic, readwrite) int encoder;
 
 @property (nonatomic, readwrite) HBVideoQualityType qualityType;
diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m
index d1641087e..6dfc16325 100644
--- a/macosx/HBVideo.m
+++ b/macosx/HBVideo.m
@@ -15,6 +15,8 @@ NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
 
 @interface HBVideo ()
 
+@property (nonatomic, readwrite, weak) HBJob *job;
+
 @property (nonatomic, readwrite) double qualityMinValue;
 @property (nonatomic, readwrite) double qualityMaxValue;