diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/spine-cpp/include/spine/AnimationState.h
index 3563e3eb9..0085d2f6f 100644
--- a/spine-cpp/spine-cpp/include/spine/AnimationState.h
+++ b/spine-cpp/spine-cpp/include/spine/AnimationState.h
@@ -48,8 +48,8 @@ namespace spine {
 		EventType_Start = 0,
 		EventType_Interrupt,
 		EventType_End,
-		EventType_Complete,
 		EventType_Dispose,
+		EventType_Complete,
 		EventType_Event
 	};
 
diff --git a/spine-cpp/spine-cpp/include/spine/BoneLocal.h b/spine-cpp/spine-cpp/include/spine/BoneLocal.h
index 61e571530..c319d7728 100644
--- a/spine-cpp/spine-cpp/include/spine/BoneLocal.h
+++ b/spine-cpp/spine-cpp/include/spine/BoneLocal.h
@@ -52,6 +52,7 @@ namespace spine {
 		friend class TranslateTimeline;
 		friend class TranslateXTimeline;
 		friend class TranslateYTimeline;
+		friend class SkeletonJson;
 		friend class Skeleton;
 		friend class FromProperty;
 		friend class ToProperty;
diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintPose.h b/spine-cpp/spine-cpp/include/spine/IkConstraintPose.h
index 8f5b9471c..6b3483903 100644
--- a/spine-cpp/spine-cpp/include/spine/IkConstraintPose.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraintPose.h
@@ -39,6 +39,7 @@ namespace spine {
 	class SP_API IkConstraintPose : public Pose<IkConstraintPose> {
 		friend class IkConstraint;
 		friend class IkConstraintTimeline;
+		friend class SkeletonJson;
 
 	public:
 		IkConstraintPose();
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPose.h b/spine-cpp/spine-cpp/include/spine/PathConstraintPose.h
index 962f40c02..340bdb6b9 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintPose.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintPose.h
@@ -40,6 +40,7 @@ namespace spine {
         friend class PathConstraintPositionTimeline;
         friend class PathConstraintSpacingTimeline;
         friend class PathConstraintMixTimeline;
+        friend class SkeletonJson;
 
     private:
         float _position;
diff --git a/spine-cpp/spine-cpp/include/spine/PhysicsConstraintPose.h b/spine-cpp/spine-cpp/include/spine/PhysicsConstraintPose.h
index 94db84af7..5887fa8f2 100644
--- a/spine-cpp/spine-cpp/include/spine/PhysicsConstraintPose.h
+++ b/spine-cpp/spine-cpp/include/spine/PhysicsConstraintPose.h
@@ -38,6 +38,7 @@ namespace spine {
     class SP_API PhysicsConstraintPose : public Pose<PhysicsConstraintPose> {
         friend class PhysicsConstraint;
         friend class PhysicsConstraintTimeline;
+        friend class SkeletonJson;
 
     private:
         float _inertia;
diff --git a/spine-cpp/spine-cpp/include/spine/SliderPose.h b/spine-cpp/spine-cpp/include/spine/SliderPose.h
index a517791dc..04798574e 100644
--- a/spine-cpp/spine-cpp/include/spine/SliderPose.h
+++ b/spine-cpp/spine-cpp/include/spine/SliderPose.h
@@ -41,6 +41,7 @@ namespace spine {
         friend class Slider;
         friend class SliderMixTimeline;
         friend class SliderTimeline;
+        friend class SkeletonJson;
     private:
         float _time, _mix;
 
diff --git a/spine-cpp/spine-cpp/include/spine/SlotPose.h b/spine-cpp/spine-cpp/include/spine/SlotPose.h
index a363236d8..faa55debc 100644
--- a/spine-cpp/spine-cpp/include/spine/SlotPose.h
+++ b/spine-cpp/spine-cpp/include/spine/SlotPose.h
@@ -50,6 +50,7 @@ namespace spine {
 		friend class RGBA2Timeline;
 		friend class RGB2Timeline;
 		friend class PathConstraint;
+		friend class SkeletonJson;
 
 	protected:
 		Color _color;
diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintPose.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintPose.h
index f0a4fcc2f..f498d0345 100644
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraintPose.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintPose.h
@@ -52,6 +52,7 @@ namespace spine {
         friend class ToShearY;
         friend class TransformConstraint;
         friend class TransformConstraintTimeline;
+        friend class SkeletonJson;
 
     private:
         float _mixRotate, _mixX, _mixY, _mixScaleX, _mixScaleY, _mixShearY;