diff --git a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
index d8f820111..a226f36a6 100644
--- a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
+++ b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
@@ -45,7 +45,7 @@ namespace Spine
     ///
     class AtlasAttachmentLoader : public AttachmentLoader
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         AtlasAttachmentLoader (Vector<Atlas*>& inAtlasArray) : _atlasArray(inAtlasArray)
diff --git a/spine-cpp/spine-cpp/include/spine/Attachment.h b/spine-cpp/spine-cpp/include/spine/Attachment.h
index fdf5a1a58..48c9e2cc1 100644
--- a/spine-cpp/spine-cpp/include/spine/Attachment.h
+++ b/spine-cpp/spine-cpp/include/spine/Attachment.h
@@ -31,7 +31,7 @@
 #ifndef Spine_Attachment_h
 #define Spine_Attachment_h
 
-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>
 
 #include <string>
 
@@ -39,7 +39,7 @@ namespace Spine
 {
     class Attachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         Attachment(std::string name);
diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h b/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h
index b04b5f929..7712e4cc1 100644
--- a/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h
+++ b/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h
@@ -31,7 +31,7 @@
 #ifndef Spine_AttachmentLoader_h
 #define Spine_AttachmentLoader_h
 
-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>
 
 #include <string>
 
@@ -47,7 +47,7 @@ namespace Spine
     
     class AttachmentLoader
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
         /// @return May be NULL to not load any attachment.
         virtual RegionAttachment* newRegionAttachment(Skin& skin, std::string name, std::string path) = 0;
diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h b/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h
index 8268b47d1..31267ada8 100644
--- a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h
@@ -46,7 +46,7 @@ namespace Spine
     
     class AttachmentTimeline : public Timeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         AttachmentTimeline(int frameCount)
diff --git a/spine-cpp/spine-cpp/include/spine/Bone.h b/spine-cpp/spine-cpp/include/spine/Bone.h
index 9900324be..7ae7813e9 100644
--- a/spine-cpp/spine-cpp/include/spine/Bone.h
+++ b/spine-cpp/spine-cpp/include/spine/Bone.h
@@ -47,7 +47,7 @@ namespace Spine
     /// constraint or application code modifies the world transform after it was computed from the local transform.
     class Bone : public Updatable
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
         friend class RotateTimeline;
         friend class IkConstraint;
diff --git a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
index 996af9f94..1ad9f13d0 100644
--- a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
@@ -38,7 +38,7 @@ namespace Spine
     /// Attachment that has a polygon for bounds checking.
     class BoundingBoxAttachment : public VertexAttachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
         BoundingBoxAttachment(std::string name);
     };
diff --git a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
index bd9c7ebf2..6ee27813d 100644
--- a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
@@ -39,7 +39,7 @@ namespace Spine
     
     class ClippingAttachment : public VertexAttachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         ClippingAttachment(std::string name);
diff --git a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h b/spine-cpp/spine-cpp/include/spine/ColorTimeline.h
index 8da2c5700..c12c54f1c 100644
--- a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ColorTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class ColorTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        public const int ENTRIES = 5;
 //        protected const int PREV_TIME = -5, PREV_R = -4, PREV_G = -3, PREV_B = -2, PREV_A = -1;
diff --git a/spine-cpp/spine-cpp/include/spine/Constraint.h b/spine-cpp/spine-cpp/include/spine/Constraint.h
index aa0122c34..18d45cece 100644
--- a/spine-cpp/spine-cpp/include/spine/Constraint.h
+++ b/spine-cpp/spine-cpp/include/spine/Constraint.h
@@ -38,7 +38,7 @@ namespace Spine
     /// The interface for all constraints.
     class Constraint : public Updatable
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         Constraint();
diff --git a/spine-cpp/spine-cpp/include/spine/CurveTimeline.h b/spine-cpp/spine-cpp/include/spine/CurveTimeline.h
index a5222e31e..38f489b26 100644
--- a/spine-cpp/spine-cpp/include/spine/CurveTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/CurveTimeline.h
@@ -41,7 +41,7 @@ namespace Spine
     /// Base class for frames that use an interpolation bezier curve.
     class CurveTimeline : public Timeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         CurveTimeline(int frameCount);
diff --git a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
index 90d768b34..6e4aa3512 100644
--- a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class DeformTimeline : CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        internal int slotIndex;
 //        internal float[] frames;
diff --git a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
index 487f619a7..97648b8a7 100644
--- a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class DrawOrderTimeline : public Timeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        internal float[] frames;
 //        private int[][] drawOrders;
diff --git a/spine-cpp/spine-cpp/include/spine/EventTimeline.h b/spine-cpp/spine-cpp/include/spine/EventTimeline.h
index 8fe56819e..67313e7dc 100644
--- a/spine-cpp/spine-cpp/include/spine/EventTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/EventTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class EventTimeline : public Timeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        internal float[] frames;
 //        private Event[] events;
diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraint.h b/spine-cpp/spine-cpp/include/spine/IkConstraint.h
index c09f8c7cd..b40f06867 100644
--- a/spine-cpp/spine-cpp/include/spine/IkConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraint.h
@@ -45,7 +45,7 @@ namespace Spine
     {
         friend class Skeleton;
         
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         /// Adjusts the bone rotation so the tip is as close to the target position as possible. The target is specified
diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
index b7605da11..ac04b035d 100644
--- a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class IkConstraintTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        public const int ENTRIES = 3;
 //        private const int PREV_TIME = -3, PREV_MIX = -2, PREV_BEND_DIRECTION = -1;
diff --git a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
index 821c73dd9..dee544d61 100644
--- a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
@@ -42,7 +42,7 @@ namespace Spine
     /// Attachment that displays a texture region using a mesh.
     class MeshAttachment : public VertexAttachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         MeshAttachment(std::string name);
diff --git a/spine-cpp/spine-cpp/include/spine/PathAttachment.h b/spine-cpp/spine-cpp/include/spine/PathAttachment.h
index 6f0e53993..a261daad8 100644
--- a/spine-cpp/spine-cpp/include/spine/PathAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/PathAttachment.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class PathAttachment : public VertexAttachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         PathAttachment(std::string name);
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraint.h b/spine-cpp/spine-cpp/include/spine/PathConstraint.h
index 7f6440c48..e7cf63721 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraint.h
@@ -47,7 +47,7 @@ namespace Spine
     {
         friend class Skeleton;
         
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         PathConstraint(PathConstraintData& data, Skeleton& skeleton);
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
index a218bde35..c27619e0a 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class PathConstraintMixTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        public const int ENTRIES = 3;
 //        private const int PREV_TIME = -3, PREV_ROTATE = -2, PREV_TRANSLATE = -1;
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
index 1197aad93..5d58d5eb6 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class PathConstraintPositionTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        public const int ENTRIES = 2;
 //        protected const int PREV_TIME = -2, PREV_VALUE = -1;
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
index 75969f1a3..5ff6892a5 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class PathConstraintSpacingTimeline : public PathConstraintPositionTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        override public int PropertyId {
 //            get { return ((int)TimelineType.PathConstraintSpacing << 24) + pathConstraintIndex; }
diff --git a/spine-cpp/spine-cpp/include/spine/PointAttachment.h b/spine-cpp/spine-cpp/include/spine/PointAttachment.h
index 6738021a7..cb9385f2b 100644
--- a/spine-cpp/spine-cpp/include/spine/PointAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/PointAttachment.h
@@ -46,7 +46,7 @@ namespace Spine
     /// 
     class PointAttachment : public Attachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         PointAttachment(std::string name);
diff --git a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
index c85c0be1c..9151691c0 100644
--- a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
@@ -46,7 +46,7 @@ namespace Spine
     /// Attachment that displays a texture region.
     class RegionAttachment : public Attachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         RegionAttachment(std::string name);
diff --git a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h b/spine-cpp/spine-cpp/include/spine/RotateTimeline.h
index dcc013b71..ff1fb3ae7 100644
--- a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/RotateTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class RotateTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         static const int ENTRIES = 2;
diff --git a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h b/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
index 00e10e325..075fb9b9c 100644
--- a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class ScaleTimeline : public TranslateTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        override public int PropertyId {
 //            get { return ((int)TimelineType.Scale << 24) + boneIndex; }
diff --git a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
index 1b367e2c2..b04c4156d 100644
--- a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class ShearTimeline : public TranslateTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        override public int PropertyId {
 //            get { return ((int)TimelineType.Shear << 24) + boneIndex; }
diff --git a/spine-cpp/spine-cpp/include/spine/RTTI.h b/spine-cpp/spine-cpp/include/spine/SpineRTTI.h
similarity index 69%
rename from spine-cpp/spine-cpp/include/spine/RTTI.h
rename to spine-cpp/spine-cpp/include/spine/SpineRTTI.h
index 79f413efa..9cf985ae8 100644
--- a/spine-cpp/spine-cpp/include/spine/RTTI.h
+++ b/spine-cpp/spine-cpp/include/spine/SpineRTTI.h
@@ -28,48 +28,48 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#ifndef Spine_RTTI_h
-#define Spine_RTTI_h
+#ifndef Spine_SPINE_RTTI_h
+#define Spine_SPINE_RTTI_h
 
 #include <string>
 
 namespace Spine
 {
-    class RTTI
+    class SPINE_RTTI
     {
     public:
-        RTTI(const std::string& className);
+        SPINE_RTTI(const std::string& className);
         
-        RTTI(const std::string& className, const RTTI& baseRTTI);
+        SPINE_RTTI(const std::string& className, const SPINE_RTTI& baseSPINE_RTTI);
         
         const std::string& getClassName() const;
         
-        bool isExactly(const RTTI& rtti) const;
+        bool isExactly(const SPINE_RTTI& rtti) const;
         
-        bool derivesFrom(const RTTI& rtti) const;
+        bool derivesFrom(const SPINE_RTTI& rtti) const;
         
     private:
         // Prevent copying
-        RTTI(const RTTI& obj);
-        RTTI& operator=(const RTTI& obj);
+        SPINE_RTTI(const SPINE_RTTI& obj);
+        SPINE_RTTI& operator=(const SPINE_RTTI& obj);
         
         const std::string m_className;
-        const RTTI *m_pBaseRTTI;
+        const SPINE_RTTI *m_pBaseSPINE_RTTI;
     };
 }
 
-#define RTTI_DECL \
+#define SPINE_RTTI_DECL \
 public: \
-static const Spine::RTTI rtti; \
-virtual const Spine::RTTI& getRTTI();
+static const Spine::SPINE_RTTI rtti; \
+virtual const Spine::SPINE_RTTI& getSPINE_RTTI();
 
-#define RTTI_IMPL_NOPARENT(name) \
-const Spine::RTTI name::rtti(#name); \
-const Spine::RTTI& name::getRTTI() { return rtti; }
+#define SPINE_RTTI_IMPL_NOPARENT(name) \
+const Spine::SPINE_RTTI name::rtti(#name); \
+const Spine::SPINE_RTTI& name::getSPINE_RTTI() { return rtti; }
 
-#define RTTI_IMPL(name,parent) \
-const Spine::RTTI name::rtti(#name, parent::rtti); \
-const Spine::RTTI& name::getRTTI() { return rtti; }
+#define SPINE_RTTI_IMPL(name,parent) \
+const Spine::SPINE_RTTI name::rtti(#name, parent::rtti); \
+const Spine::SPINE_RTTI& name::getSPINE_RTTI() { return rtti; }
 
-#endif /* Spine_RTTI_h */
+#endif /* Spine_SPINE_RTTI_h */
 
diff --git a/spine-cpp/spine-cpp/include/spine/Timeline.h b/spine-cpp/spine-cpp/include/spine/Timeline.h
index b00db7b28..0160e371a 100644
--- a/spine-cpp/spine-cpp/include/spine/Timeline.h
+++ b/spine-cpp/spine-cpp/include/spine/Timeline.h
@@ -31,7 +31,7 @@
 #ifndef Spine_Timeline_h
 #define Spine_Timeline_h
 
-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>
 #include <spine/Vector.h>
 #include <spine/MixPose.h>
 #include <spine/MixDirection.h>
@@ -43,7 +43,7 @@ namespace Spine
     
     class Timeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         Timeline();
diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
index 262c3a210..c2036d4ab 100644
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
@@ -45,7 +45,7 @@ namespace Spine
     {
         friend class Skeleton;
         
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         TransformConstraint(TransformConstraintData& data, Skeleton& skeleton);
diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
index d46b817f7..00debb06d 100644
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class TransformConstraintTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        public const int ENTRIES = 5;
 //        private const int PREV_TIME = -5, PREV_ROTATE = -4, PREV_TRANSLATE = -3, PREV_SCALE = -2, PREV_SHEAR = -1;
diff --git a/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h b/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h
index ca6a0ce9d..8abccc9e2 100644
--- a/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h
@@ -40,7 +40,7 @@ namespace Spine
 {
     class TranslateTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        public const int ENTRIES = 3;
 //        protected const int PREV_TIME = -3, PREV_X = -2, PREV_Y = -1;
diff --git a/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h b/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
index befea9f94..8d814439f 100644
--- a/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
@@ -37,7 +37,7 @@ namespace Spine
 {
     class TwoColorTimeline : public CurveTimeline
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
 //        public const int ENTRIES = 8;
 //        protected const int PREV_TIME = -8, PREV_R = -7, PREV_G = -6, PREV_B = -5, PREV_A = -4;
diff --git a/spine-cpp/spine-cpp/include/spine/Updatable.h b/spine-cpp/spine-cpp/include/spine/Updatable.h
index fac634191..cb36e863e 100644
--- a/spine-cpp/spine-cpp/include/spine/Updatable.h
+++ b/spine-cpp/spine-cpp/include/spine/Updatable.h
@@ -31,13 +31,13 @@
 #ifndef Spine_Updatable_h
 #define Spine_Updatable_h
 
-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>
 
 namespace Spine
 {
     class Updatable
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         Updatable();
diff --git a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h b/spine-cpp/spine-cpp/include/spine/VertexAttachment.h
index 6405015f6..7c7841bd0 100644
--- a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/VertexAttachment.h
@@ -42,7 +42,7 @@ namespace Spine
     /// An attachment with vertices that are transformed by one or more bones and can be deformed by a slot's vertices.
     class VertexAttachment : public Attachment
     {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
         
     public:
         VertexAttachment(std::string name);
diff --git a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
index 1daf02530..0d5a99aca 100644
--- a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(AtlasAttachmentLoader, AttachmentLoader);
+    SPINE_RTTI_IMPL(AtlasAttachmentLoader, AttachmentLoader);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Attachment.cpp b/spine-cpp/spine-cpp/src/spine/Attachment.cpp
index 74a734f27..93107e041 100644
--- a/spine-cpp/spine-cpp/src/spine/Attachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Attachment.cpp
@@ -34,7 +34,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(Attachment);
+    SPINE_RTTI_IMPL_NOPARENT(Attachment);
     
     Attachment::Attachment(std::string name) : _name(name)
     {
diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp b/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp
index bfe43d75f..04c5e3979 100644
--- a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(AttachmentLoader);
+    SPINE_RTTI_IMPL_NOPARENT(AttachmentLoader);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp b/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp
index e91dce772..cc562fd80 100644
--- a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp
@@ -38,5 +38,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(AttachmentTimeline, Timeline);
+    SPINE_RTTI_IMPL(AttachmentTimeline, Timeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Bone.cpp b/spine-cpp/spine-cpp/src/spine/Bone.cpp
index 71e119c95..7ad89853c 100644
--- a/spine-cpp/spine-cpp/src/spine/Bone.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Bone.cpp
@@ -38,7 +38,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(Bone, Updatable);
+    SPINE_RTTI_IMPL(Bone, Updatable);
     
     bool Bone::yDown = false;
     
diff --git a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
index ffa7f7355..df7a70934 100644
--- a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
@@ -32,7 +32,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(BoundingBoxAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(BoundingBoxAttachment, VertexAttachment);
     
     BoundingBoxAttachment::BoundingBoxAttachment(std::string name) : VertexAttachment(name)
     {
diff --git a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
index c87de561c..1ad21ba86 100644
--- a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
@@ -34,7 +34,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(ClippingAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(ClippingAttachment, VertexAttachment);
     
     ClippingAttachment::ClippingAttachment(std::string name) : VertexAttachment(name)
     {
diff --git a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp
index e1a2c4ff4..e53c26b97 100644
--- a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(ColorTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(ColorTimeline, CurveTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Constraint.cpp b/spine-cpp/spine-cpp/src/spine/Constraint.cpp
index bad9d1a0b..206c93b5e 100644
--- a/spine-cpp/spine-cpp/src/spine/Constraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Constraint.cpp
@@ -32,7 +32,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(Constraint, Updatable);
+    SPINE_RTTI_IMPL(Constraint, Updatable);
     
     Constraint::Constraint()
     {
diff --git a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp b/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp
index ea4047eb2..5d0e58401 100644
--- a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp
@@ -34,7 +34,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(CurveTimeline, Timeline);
+    SPINE_RTTI_IMPL(CurveTimeline, Timeline);
     
     const float CurveTimeline::LINEAR = 0;
     const float CurveTimeline::STEPPED = 1;
diff --git a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp b/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp
index 42e9be963..fb99c6d33 100644
--- a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(DeformTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(DeformTimeline, CurveTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp b/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp
index 9ed5c7e7f..34f9c9b14 100644
--- a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(DrawOrderTimeline, Timeline);
+    SPINE_RTTI_IMPL(DrawOrderTimeline, Timeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp b/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp
index ef4e0e8a5..dc6ee5246 100644
--- a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(EventTimeline, Timeline);
+    SPINE_RTTI_IMPL(EventTimeline, Timeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
index 8064b31a5..4c6c0e8c5 100644
--- a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
@@ -39,7 +39,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(IkConstraint, Constraint);
+    SPINE_RTTI_IMPL(IkConstraint, Constraint);
     
     void IkConstraint::apply(Bone& bone, float targetX, float targetY, float alpha)
     {
diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp
index 19755ad12..603b48c06 100644
--- a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(IkConstraintTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(IkConstraintTimeline, CurveTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
index 6d928a6c3..09793ad9a 100644
--- a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
@@ -32,7 +32,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(MeshAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(MeshAttachment, VertexAttachment);
     
     MeshAttachment::MeshAttachment(std::string name) : VertexAttachment(name),
     _regionOffsetX(0),
diff --git a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
index 54bd9337b..f997e67a0 100644
--- a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
@@ -32,7 +32,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(PathAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(PathAttachment, VertexAttachment);
     
     PathAttachment::PathAttachment(std::string name) : VertexAttachment(name)
     {
diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
index df73d6195..5d90c2ea7 100644
--- a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
@@ -45,7 +45,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(PathConstraint, Constraint);
+    SPINE_RTTI_IMPL(PathConstraint, Constraint);
     
     const float PathConstraint::EPSILON = 0.00001f;
     const int PathConstraint::NONE = -1;
@@ -79,7 +79,7 @@ namespace Spine
     void PathConstraint::update()
     {
         Attachment* baseAttachment = _target->getAttachment();
-        if (baseAttachment == NULL || !baseAttachment->getRTTI().derivesFrom(PathAttachment::rtti))
+        if (baseAttachment == NULL || !baseAttachment->getSPINE_RTTI().derivesFrom(PathAttachment::rtti))
         {
             return;
         }
diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp
index bd849f29d..515c7bf17 100644
--- a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(PathConstraintMixTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(PathConstraintMixTimeline, CurveTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp
index 0d944901e..ca033cd55 100644
--- a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(PathConstraintPositionTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(PathConstraintPositionTimeline, CurveTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp
index f9becd25c..7a9f5567f 100644
--- a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(PathConstraintSpacingTimeline, PathConstraintPositionTimeline);
+    SPINE_RTTI_IMPL(PathConstraintSpacingTimeline, PathConstraintPositionTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
index d309c8d48..b6b93c2ec 100644
--- a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
@@ -36,7 +36,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(PointAttachment, Attachment);
+    SPINE_RTTI_IMPL(PointAttachment, Attachment);
     
     PointAttachment::PointAttachment(std::string name) : Attachment(name)
     {
diff --git a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
index 310a4619b..0ebbb8a41 100644
--- a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
@@ -38,7 +38,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(RegionAttachment, Attachment);
+    SPINE_RTTI_IMPL(RegionAttachment, Attachment);
     
     const int RegionAttachment::BLX = 0;
     const int RegionAttachment::BLY = 1;
diff --git a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp b/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp
index acfeb7db1..448d88134 100644
--- a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp
@@ -40,7 +40,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(RotateTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(RotateTimeline, CurveTimeline);
     
     RotateTimeline::RotateTimeline(int frameCount) : CurveTimeline(frameCount), _boneIndex(0)
     {
diff --git a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp
index 50c06453c..2da55b080 100644
--- a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(ScaleTimeline, TranslateTimeline);
+    SPINE_RTTI_IMPL(ScaleTimeline, TranslateTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp
index b81a4442f..13d19abda 100644
--- a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(ShearTimeline, TranslateTimeline);
+    SPINE_RTTI_IMPL(ShearTimeline, TranslateTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
index 783ddda3b..454940d22 100644
--- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
@@ -471,7 +471,7 @@ namespace Spine
             int verticesLength = 0;
             Attachment* attachment = slot->getAttachment();
             
-            if (attachment != NULL && attachment->getRTTI().derivesFrom(RegionAttachment::rtti))
+            if (attachment != NULL && attachment->getSPINE_RTTI().derivesFrom(RegionAttachment::rtti))
             {
                 RegionAttachment* regionAttachment = static_cast<RegionAttachment*>(attachment);
 
@@ -482,7 +482,7 @@ namespace Spine
                 }
                 regionAttachment->computeWorldVertices(slot->getBone(), outVertexBuffer, 0);
             }
-            else if (attachment != NULL && attachment->getRTTI().derivesFrom(MeshAttachment::rtti))
+            else if (attachment != NULL && attachment->getSPINE_RTTI().derivesFrom(MeshAttachment::rtti))
             {
                 MeshAttachment* mesh = static_cast<MeshAttachment*>(attachment);
 
@@ -699,7 +699,7 @@ namespace Spine
         }
         
         Attachment* attachment = slot->_attachment;
-        if (attachment != NULL && attachment->getRTTI().derivesFrom(PathAttachment::rtti))
+        if (attachment != NULL && attachment->getSPINE_RTTI().derivesFrom(PathAttachment::rtti))
         {
             sortPathConstraintAttachment(attachment, slotBone);
         }
@@ -780,7 +780,7 @@ namespace Spine
     
     void Skeleton::sortPathConstraintAttachment(Attachment* attachment, Bone& slotBone)
     {
-        if (attachment == NULL || attachment->getRTTI().derivesFrom(PathAttachment::rtti))
+        if (attachment == NULL || attachment->getSPINE_RTTI().derivesFrom(PathAttachment::rtti))
         {
             return;
         }
diff --git a/spine-cpp/spine-cpp/src/spine/RTTI.cpp b/spine-cpp/spine-cpp/src/spine/SpineRTTI.cpp
similarity index 79%
rename from spine-cpp/spine-cpp/src/spine/RTTI.cpp
rename to spine-cpp/spine-cpp/src/spine/SpineRTTI.cpp
index 9d271f894..e5fc40ec4 100644
--- a/spine-cpp/spine-cpp/src/spine/RTTI.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SpineRTTI.cpp
@@ -28,33 +28,33 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>
 
 namespace Spine
 {
-    RTTI::RTTI(const std::string& className) : m_className(className), m_pBaseRTTI(NULL)
+    SPINE_RTTI::SPINE_RTTI(const std::string& className) : m_className(className), m_pBaseSPINE_RTTI(NULL)
     {
         // Empty
     }
     
-    RTTI::RTTI(const std::string& className, const RTTI& baseRTTI) : m_className(className), m_pBaseRTTI(&baseRTTI)
+    SPINE_RTTI::SPINE_RTTI(const std::string& className, const SPINE_RTTI& baseSPINE_RTTI) : m_className(className), m_pBaseSPINE_RTTI(&baseSPINE_RTTI)
     {
         // Empty
     }
     
-    const std::string& RTTI::getClassName() const
+    const std::string& SPINE_RTTI::getClassName() const
     {
         return m_className;
     }
     
-    bool RTTI::isExactly(const RTTI& rtti) const
+    bool SPINE_RTTI::isExactly(const SPINE_RTTI& rtti) const
     {
         return (this == &rtti);
     }
     
-    bool RTTI::derivesFrom(const RTTI& rtti) const
+    bool SPINE_RTTI::derivesFrom(const SPINE_RTTI& rtti) const
     {
-        const RTTI * pCompare = this;
+        const SPINE_RTTI * pCompare = this;
         
         while (pCompare)
         {
@@ -63,7 +63,7 @@ namespace Spine
                 return true;
             }
             
-            pCompare = pCompare->m_pBaseRTTI;
+            pCompare = pCompare->m_pBaseSPINE_RTTI;
         }
         
         return false;
diff --git a/spine-cpp/spine-cpp/src/spine/Timeline.cpp b/spine-cpp/spine-cpp/src/spine/Timeline.cpp
index 6dac2f210..ddd0d5fe6 100644
--- a/spine-cpp/spine-cpp/src/spine/Timeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Timeline.cpp
@@ -35,7 +35,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(Timeline);
+    SPINE_RTTI_IMPL_NOPARENT(Timeline);
     
     Timeline::Timeline()
     {
diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
index 6ff042820..04cd07a1c 100644
--- a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
@@ -39,7 +39,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(TransformConstraint, Constraint);
+    SPINE_RTTI_IMPL(TransformConstraint, Constraint);
     
     TransformConstraint::TransformConstraint(TransformConstraintData& data, Skeleton& skeleton) : Constraint(),
     _data(data),
diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp
index a4fe5dd3a..daceecc8a 100644
--- a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp
@@ -32,6 +32,6 @@
 
 namespace Spine
 {
-    RTTI_IMPL(TransformConstraintTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(TransformConstraintTimeline, CurveTimeline);
 }
 
diff --git a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp
index 5de311b78..97c43cfce 100644
--- a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(TranslateTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(TranslateTimeline, CurveTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp
index 0e15ae88a..45adf3def 100644
--- a/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp
@@ -32,5 +32,5 @@
 
 namespace Spine
 {
-    RTTI_IMPL(TwoColorTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(TwoColorTimeline, CurveTimeline);
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Updatable.cpp b/spine-cpp/spine-cpp/src/spine/Updatable.cpp
index 598955a9a..e40d01725 100644
--- a/spine-cpp/spine-cpp/src/spine/Updatable.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Updatable.cpp
@@ -32,7 +32,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(Updatable);
+    SPINE_RTTI_IMPL_NOPARENT(Updatable);
     
     Updatable::Updatable()
     {
diff --git a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp
index 36410d0d4..e16de993e 100644
--- a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp
@@ -37,7 +37,7 @@
 
 namespace Spine
 {
-    RTTI_IMPL(VertexAttachment, Attachment);
+    SPINE_RTTI_IMPL(VertexAttachment, Attachment);
     
     VertexAttachment::VertexAttachment(std::string name) : Attachment(name), _worldVerticesLength(0), _id(getNextID())
     {