Google Git
Sign in
skia/external/github.com/rive-app/rive-cpp/bb1dc56b1b46b3060f82011964df538d12db6dd3^!/.
commit
bb1dc56b1b46b3060f82011964df538d12db6dd3
[log]
author
JCash <mwesterdahl76@gmail.com>
Mon Aug 09 17:58:35 2021 +0200
committer
Luigi Rosso <luigi-rosso@users.noreply.github.com>
Mon Aug 09 13:23:13 2021 -0700
tree
42bffd09057e30e28c738e073db75a62484bb317
parent
d1af34bec215ed1fb0969c8e7aae832e44c12e64 [diff]
Updated includes

diff --git a/include/rive/animation/animation.hpp b/include/rive/animation/animation.hpp
index b08a8d1..1cf6c4a 100644
--- a/include/rive/animation/animation.hpp
+++ b/include/rive/animation/animation.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ANIMATION_HPP_
 #define _RIVE_ANIMATION_HPP_
-#include "generated/animation/animation_base.hpp"
+#include "rive/generated/animation/animation_base.hpp"
 namespace rive
 {
 	class Animation : public AnimationBase

diff --git a/include/rive/animation/animation_state.hpp b/include/rive/animation/animation_state.hpp
index a6328e3..648549e 100644
--- a/include/rive/animation/animation_state.hpp
+++ b/include/rive/animation/animation_state.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ANIMATION_STATE_HPP_
 #define _RIVE_ANIMATION_STATE_HPP_
-#include "generated/animation/animation_state_base.hpp"
+#include "rive/generated/animation/animation_state_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/animation_state_instance.hpp b/include/rive/animation/animation_state_instance.hpp
index ddcba1d..8e63590 100644
--- a/include/rive/animation/animation_state_instance.hpp
+++ b/include/rive/animation/animation_state_instance.hpp

@@ -2,8 +2,8 @@
 #define _RIVE_ANIMATION_STATE_INSTANCE_HPP_
 
 #include <string>
-#include "animation/state_instance.hpp"
-#include "animation/linear_animation_instance.hpp"
+#include "rive/animation/state_instance.hpp"
+#include "rive/animation/linear_animation_instance.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/any_state.hpp b/include/rive/animation/any_state.hpp
index 5218629..bb1405a 100644
--- a/include/rive/animation/any_state.hpp
+++ b/include/rive/animation/any_state.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ANY_STATE_HPP_
 #define _RIVE_ANY_STATE_HPP_
-#include "generated/animation/any_state_base.hpp"
+#include "rive/generated/animation/any_state_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/blend_animation.hpp b/include/rive/animation/blend_animation.hpp
index 576c67b..90ee617 100644
--- a/include/rive/animation/blend_animation.hpp
+++ b/include/rive/animation/blend_animation.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_ANIMATION_HPP_
 #define _RIVE_BLEND_ANIMATION_HPP_
-#include "generated/animation/blend_animation_base.hpp"
+#include "rive/generated/animation/blend_animation_base.hpp"
 namespace rive
 {
 	class LinearAnimation;

diff --git a/include/rive/animation/blend_animation_1d.hpp b/include/rive/animation/blend_animation_1d.hpp
index 62d3121..65b9e12 100644
--- a/include/rive/animation/blend_animation_1d.hpp
+++ b/include/rive/animation/blend_animation_1d.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_ANIMATION1_D_HPP_
 #define _RIVE_BLEND_ANIMATION1_D_HPP_
-#include "generated/animation/blend_animation_1d_base.hpp"
+#include "rive/generated/animation/blend_animation_1d_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/blend_animation_direct.hpp b/include/rive/animation/blend_animation_direct.hpp
index 910a45f..bf11233 100644
--- a/include/rive/animation/blend_animation_direct.hpp
+++ b/include/rive/animation/blend_animation_direct.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_ANIMATION_DIRECT_HPP_
 #define _RIVE_BLEND_ANIMATION_DIRECT_HPP_
-#include "generated/animation/blend_animation_direct_base.hpp"
+#include "rive/generated/animation/blend_animation_direct_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/blend_state.hpp b/include/rive/animation/blend_state.hpp
index 3da98cd..4d1c6bf 100644
--- a/include/rive/animation/blend_state.hpp
+++ b/include/rive/animation/blend_state.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_STATE_HPP_
 #define _RIVE_BLEND_STATE_HPP_
-#include "generated/animation/blend_state_base.hpp"
+#include "rive/generated/animation/blend_state_base.hpp"
 #include <stdio.h>
 #include <vector>
 #include <algorithm>

diff --git a/include/rive/animation/blend_state_1d.hpp b/include/rive/animation/blend_state_1d.hpp
index eac98d6..e316542 100644
--- a/include/rive/animation/blend_state_1d.hpp
+++ b/include/rive/animation/blend_state_1d.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_STATE1_D_HPP_
 #define _RIVE_BLEND_STATE1_D_HPP_
-#include "generated/animation/blend_state_1d_base.hpp"
+#include "rive/generated/animation/blend_state_1d_base.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/blend_state_1d_instance.hpp b/include/rive/animation/blend_state_1d_instance.hpp
index df9d7a8..0dceda8 100644
--- a/include/rive/animation/blend_state_1d_instance.hpp
+++ b/include/rive/animation/blend_state_1d_instance.hpp

@@ -1,9 +1,9 @@
 #ifndef _RIVE_BLEND_STATE_1D_INSTANCE_HPP_
 #define _RIVE_BLEND_STATE_1D_INSTANCE_HPP_
 
-#include "animation/blend_state_instance.hpp"
-#include "animation/blend_state_1d.hpp"
-#include "animation/blend_animation_1d.hpp"
+#include "rive/animation/blend_state_instance.hpp"
+#include "rive/animation/blend_state_1d.hpp"
+#include "rive/animation/blend_animation_1d.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/blend_state_direct.hpp b/include/rive/animation/blend_state_direct.hpp
index 9e64e5f..e2f44a5 100644
--- a/include/rive/animation/blend_state_direct.hpp
+++ b/include/rive/animation/blend_state_direct.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_STATE_DIRECT_HPP_
 #define _RIVE_BLEND_STATE_DIRECT_HPP_
-#include "generated/animation/blend_state_direct_base.hpp"
+#include "rive/generated/animation/blend_state_direct_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/blend_state_direct_instance.hpp b/include/rive/animation/blend_state_direct_instance.hpp
index 289adeb..b0b2544 100644
--- a/include/rive/animation/blend_state_direct_instance.hpp
+++ b/include/rive/animation/blend_state_direct_instance.hpp

@@ -1,9 +1,9 @@
 #ifndef _RIVE_BLEND_STATE_DIRECT_INSTANCE_HPP_
 #define _RIVE_BLEND_STATE_DIRECT_INSTANCE_HPP_
 
-#include "animation/blend_state_instance.hpp"
-#include "animation/blend_state_direct.hpp"
-#include "animation/blend_animation_direct.hpp"
+#include "rive/animation/blend_state_instance.hpp"
+#include "rive/animation/blend_state_direct.hpp"
+#include "rive/animation/blend_animation_direct.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/blend_state_instance.hpp b/include/rive/animation/blend_state_instance.hpp
index 7ed231a..6e71517 100644
--- a/include/rive/animation/blend_state_instance.hpp
+++ b/include/rive/animation/blend_state_instance.hpp

@@ -3,9 +3,9 @@
 
 #include <string>
 #include <vector>
-#include "animation/state_instance.hpp"
-#include "animation/blend_state.hpp"
-#include "animation/linear_animation_instance.hpp"
+#include "rive/animation/state_instance.hpp"
+#include "rive/animation/blend_state.hpp"
+#include "rive/animation/linear_animation_instance.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/blend_state_transition.hpp b/include/rive/animation/blend_state_transition.hpp
index 08a49eb..207b347 100644
--- a/include/rive/animation/blend_state_transition.hpp
+++ b/include/rive/animation/blend_state_transition.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_STATE_TRANSITION_HPP_
 #define _RIVE_BLEND_STATE_TRANSITION_HPP_
-#include "generated/animation/blend_state_transition_base.hpp"
+#include "rive/generated/animation/blend_state_transition_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/cubic_interpolator.hpp b/include/rive/animation/cubic_interpolator.hpp
index 5ecb856..f63f4d0 100644
--- a/include/rive/animation/cubic_interpolator.hpp
+++ b/include/rive/animation/cubic_interpolator.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CUBIC_INTERPOLATOR_HPP_
 #define _RIVE_CUBIC_INTERPOLATOR_HPP_
-#include "generated/animation/cubic_interpolator_base.hpp"
+#include "rive/generated/animation/cubic_interpolator_base.hpp"
 namespace rive
 {
 	class CubicInterpolator : public CubicInterpolatorBase

diff --git a/include/rive/animation/entry_state.hpp b/include/rive/animation/entry_state.hpp
index 4a91324..b03e729 100644
--- a/include/rive/animation/entry_state.hpp
+++ b/include/rive/animation/entry_state.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ENTRY_STATE_HPP_
 #define _RIVE_ENTRY_STATE_HPP_
-#include "generated/animation/entry_state_base.hpp"
+#include "rive/generated/animation/entry_state_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/exit_state.hpp b/include/rive/animation/exit_state.hpp
index ea4b195..e2aad93 100644
--- a/include/rive/animation/exit_state.hpp
+++ b/include/rive/animation/exit_state.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_EXIT_STATE_HPP_
 #define _RIVE_EXIT_STATE_HPP_
-#include "generated/animation/exit_state_base.hpp"
+#include "rive/generated/animation/exit_state_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/keyed_object.hpp b/include/rive/animation/keyed_object.hpp
index a69c6f4..1ef31d7 100644
--- a/include/rive/animation/keyed_object.hpp
+++ b/include/rive/animation/keyed_object.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_KEYED_OBJECT_HPP_
 #define _RIVE_KEYED_OBJECT_HPP_
-#include "generated/animation/keyed_object_base.hpp"
+#include "rive/generated/animation/keyed_object_base.hpp"
 #include <vector>
 namespace rive
 {

diff --git a/include/rive/animation/keyed_property.hpp b/include/rive/animation/keyed_property.hpp
index 828be6c..1295f5d 100644
--- a/include/rive/animation/keyed_property.hpp
+++ b/include/rive/animation/keyed_property.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_KEYED_PROPERTY_HPP_
 #define _RIVE_KEYED_PROPERTY_HPP_
-#include "generated/animation/keyed_property_base.hpp"
+#include "rive/generated/animation/keyed_property_base.hpp"
 #include <vector>
 namespace rive
 {

diff --git a/include/rive/animation/keyframe.hpp b/include/rive/animation/keyframe.hpp
index 6c86edf..918df5d 100644
--- a/include/rive/animation/keyframe.hpp
+++ b/include/rive/animation/keyframe.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_KEY_FRAME_HPP_
 #define _RIVE_KEY_FRAME_HPP_
-#include "generated/animation/keyframe_base.hpp"
+#include "rive/generated/animation/keyframe_base.hpp"
 namespace rive
 {
 	class CubicInterpolator;

diff --git a/include/rive/animation/keyframe_color.hpp b/include/rive/animation/keyframe_color.hpp
index e362bc9..e77bde1 100644
--- a/include/rive/animation/keyframe_color.hpp
+++ b/include/rive/animation/keyframe_color.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_KEY_FRAME_COLOR_HPP_
 #define _RIVE_KEY_FRAME_COLOR_HPP_
-#include "generated/animation/keyframe_color_base.hpp"
+#include "rive/generated/animation/keyframe_color_base.hpp"
 namespace rive
 {
 	class KeyFrameColor : public KeyFrameColorBase

diff --git a/include/rive/animation/keyframe_double.hpp b/include/rive/animation/keyframe_double.hpp
index 7acf0c5..6ba5200 100644
--- a/include/rive/animation/keyframe_double.hpp
+++ b/include/rive/animation/keyframe_double.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_KEY_FRAME_DOUBLE_HPP_
 #define _RIVE_KEY_FRAME_DOUBLE_HPP_
-#include "generated/animation/keyframe_double_base.hpp"
+#include "rive/generated/animation/keyframe_double_base.hpp"
 namespace rive
 {
 	class KeyFrameDouble : public KeyFrameDoubleBase

diff --git a/include/rive/animation/keyframe_id.hpp b/include/rive/animation/keyframe_id.hpp
index 6d2e05c..294de1c 100644
--- a/include/rive/animation/keyframe_id.hpp
+++ b/include/rive/animation/keyframe_id.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_KEY_FRAME_ID_HPP_
 #define _RIVE_KEY_FRAME_ID_HPP_
-#include "generated/animation/keyframe_id_base.hpp"
+#include "rive/generated/animation/keyframe_id_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/layer_state.hpp b/include/rive/animation/layer_state.hpp
index 932147b..ad8aefd 100644
--- a/include/rive/animation/layer_state.hpp
+++ b/include/rive/animation/layer_state.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_LAYER_STATE_HPP_
 #define _RIVE_LAYER_STATE_HPP_
-#include "generated/animation/layer_state_base.hpp"
+#include "rive/generated/animation/layer_state_base.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/animation/linear_animation.hpp b/include/rive/animation/linear_animation.hpp
index 0aba0ec..77499d9 100644
--- a/include/rive/animation/linear_animation.hpp
+++ b/include/rive/animation/linear_animation.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_LINEAR_ANIMATION_HPP_
 #define _RIVE_LINEAR_ANIMATION_HPP_
-#include "animation/loop.hpp"
-#include "generated/animation/linear_animation_base.hpp"
+#include "rive/animation/loop.hpp"
+#include "rive/generated/animation/linear_animation_base.hpp"
 #include <vector>
 namespace rive
 {

diff --git a/include/rive/animation/linear_animation_instance.hpp b/include/rive/animation/linear_animation_instance.hpp
index 808f6db..a803221 100644
--- a/include/rive/animation/linear_animation_instance.hpp
+++ b/include/rive/animation/linear_animation_instance.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_LINEAR_ANIMATION_INSTANCE_HPP_
 #define _RIVE_LINEAR_ANIMATION_INSTANCE_HPP_
-#include "artboard.hpp"
+#include "rive/artboard.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/state_machine.hpp b/include/rive/animation/state_machine.hpp
index e5089a3..bb88e43 100644
--- a/include/rive/animation/state_machine.hpp
+++ b/include/rive/animation/state_machine.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_HPP_
 #define _RIVE_STATE_MACHINE_HPP_
-#include "generated/animation/state_machine_base.hpp"
+#include "rive/generated/animation/state_machine_base.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/animation/state_machine_bool.hpp b/include/rive/animation/state_machine_bool.hpp
index 10c89bf..e80e58c 100644
--- a/include/rive/animation/state_machine_bool.hpp
+++ b/include/rive/animation/state_machine_bool.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_BOOL_HPP_
 #define _RIVE_STATE_MACHINE_BOOL_HPP_
-#include "generated/animation/state_machine_bool_base.hpp"
+#include "rive/generated/animation/state_machine_bool_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/state_machine_component.hpp b/include/rive/animation/state_machine_component.hpp
index 43b012a..831201a 100644
--- a/include/rive/animation/state_machine_component.hpp
+++ b/include/rive/animation/state_machine_component.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_COMPONENT_HPP_
 #define _RIVE_STATE_MACHINE_COMPONENT_HPP_
-#include "generated/animation/state_machine_component_base.hpp"
+#include "rive/generated/animation/state_machine_component_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/state_machine_input.hpp b/include/rive/animation/state_machine_input.hpp
index ffa8ebe..1fb5479 100644
--- a/include/rive/animation/state_machine_input.hpp
+++ b/include/rive/animation/state_machine_input.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_INPUT_HPP_
 #define _RIVE_STATE_MACHINE_INPUT_HPP_
-#include "generated/animation/state_machine_input_base.hpp"
+#include "rive/generated/animation/state_machine_input_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/state_machine_instance.hpp b/include/rive/animation/state_machine_instance.hpp
index d81c5d0..7569ba7 100644
--- a/include/rive/animation/state_machine_instance.hpp
+++ b/include/rive/animation/state_machine_instance.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 #include <stddef.h>
-#include "animation/linear_animation_instance.hpp"
+#include "rive/animation/linear_animation_instance.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/state_machine_layer.hpp b/include/rive/animation/state_machine_layer.hpp
index c83b788..3279e8d 100644
--- a/include/rive/animation/state_machine_layer.hpp
+++ b/include/rive/animation/state_machine_layer.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_LAYER_HPP_
 #define _RIVE_STATE_MACHINE_LAYER_HPP_
-#include "generated/animation/state_machine_layer_base.hpp"
+#include "rive/generated/animation/state_machine_layer_base.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/animation/state_machine_layer_component.hpp b/include/rive/animation/state_machine_layer_component.hpp
index 58a4750..25dd045 100644
--- a/include/rive/animation/state_machine_layer_component.hpp
+++ b/include/rive/animation/state_machine_layer_component.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_LAYER_COMPONENT_HPP_
 #define _RIVE_STATE_MACHINE_LAYER_COMPONENT_HPP_
-#include "generated/animation/state_machine_layer_component_base.hpp"
+#include "rive/generated/animation/state_machine_layer_component_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/state_machine_number.hpp b/include/rive/animation/state_machine_number.hpp
index c390ee0..590f40c 100644
--- a/include/rive/animation/state_machine_number.hpp
+++ b/include/rive/animation/state_machine_number.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_NUMBER_HPP_
 #define _RIVE_STATE_MACHINE_NUMBER_HPP_
-#include "generated/animation/state_machine_number_base.hpp"
+#include "rive/generated/animation/state_machine_number_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/state_machine_trigger.hpp b/include/rive/animation/state_machine_trigger.hpp
index c2f671d..50e6a7e 100644
--- a/include/rive/animation/state_machine_trigger.hpp
+++ b/include/rive/animation/state_machine_trigger.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_TRIGGER_HPP_
 #define _RIVE_STATE_MACHINE_TRIGGER_HPP_
-#include "generated/animation/state_machine_trigger_base.hpp"
+#include "rive/generated/animation/state_machine_trigger_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/state_transition.hpp b/include/rive/animation/state_transition.hpp
index af082d7..54a9360 100644
--- a/include/rive/animation/state_transition.hpp
+++ b/include/rive/animation/state_transition.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STATE_TRANSITION_HPP_
 #define _RIVE_STATE_TRANSITION_HPP_
-#include "animation/state_transition_flags.hpp"
-#include "generated/animation/state_transition_base.hpp"
+#include "rive/animation/state_transition_flags.hpp"
+#include "rive/generated/animation/state_transition_base.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/animation/system_state_instance.hpp b/include/rive/animation/system_state_instance.hpp
index 2e8b26e..68e860d 100644
--- a/include/rive/animation/system_state_instance.hpp
+++ b/include/rive/animation/system_state_instance.hpp

@@ -2,7 +2,7 @@
 #define _RIVE_SYSTEM_STATE_INSTANCE_HPP_
 
 #include <string>
-#include "animation/state_instance.hpp"
+#include "rive/animation/state_instance.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/transition_bool_condition.hpp b/include/rive/animation/transition_bool_condition.hpp
index 40a1f27..d0bd53b 100644
--- a/include/rive/animation/transition_bool_condition.hpp
+++ b/include/rive/animation/transition_bool_condition.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TRANSITION_BOOL_CONDITION_HPP_
 #define _RIVE_TRANSITION_BOOL_CONDITION_HPP_
-#include "generated/animation/transition_bool_condition_base.hpp"
+#include "rive/generated/animation/transition_bool_condition_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/transition_condition.hpp b/include/rive/animation/transition_condition.hpp
index b970cbd..afa2e73 100644
--- a/include/rive/animation/transition_condition.hpp
+++ b/include/rive/animation/transition_condition.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TRANSITION_CONDITION_HPP_
 #define _RIVE_TRANSITION_CONDITION_HPP_
-#include "generated/animation/transition_condition_base.hpp"
+#include "rive/generated/animation/transition_condition_base.hpp"
 
 namespace rive
 {

diff --git a/include/rive/animation/transition_number_condition.hpp b/include/rive/animation/transition_number_condition.hpp
index 99d49fc..092da24 100644
--- a/include/rive/animation/transition_number_condition.hpp
+++ b/include/rive/animation/transition_number_condition.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TRANSITION_NUMBER_CONDITION_HPP_
 #define _RIVE_TRANSITION_NUMBER_CONDITION_HPP_
-#include "generated/animation/transition_number_condition_base.hpp"
+#include "rive/generated/animation/transition_number_condition_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/transition_trigger_condition.hpp b/include/rive/animation/transition_trigger_condition.hpp
index 72f26bd..f9cc6ce 100644
--- a/include/rive/animation/transition_trigger_condition.hpp
+++ b/include/rive/animation/transition_trigger_condition.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TRANSITION_TRIGGER_CONDITION_HPP_
 #define _RIVE_TRANSITION_TRIGGER_CONDITION_HPP_
-#include "generated/animation/transition_trigger_condition_base.hpp"
+#include "rive/generated/animation/transition_trigger_condition_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/animation/transition_value_condition.hpp b/include/rive/animation/transition_value_condition.hpp
index 52ab1cc..f4a9124 100644
--- a/include/rive/animation/transition_value_condition.hpp
+++ b/include/rive/animation/transition_value_condition.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSITION_VALUE_CONDITION_HPP_
 #define _RIVE_TRANSITION_VALUE_CONDITION_HPP_
-#include "generated/animation/transition_value_condition_base.hpp"
-#include "animation/transition_condition_op.hpp"
+#include "rive/generated/animation/transition_value_condition_base.hpp"
+#include "rive/animation/transition_condition_op.hpp"
 
 namespace rive
 {

diff --git a/include/rive/artboard.hpp b/include/rive/artboard.hpp
index 6cc4206..a7ec00c 100644
--- a/include/rive/artboard.hpp
+++ b/include/rive/artboard.hpp

@@ -1,12 +1,12 @@
 #ifndef _RIVE_ARTBOARD_HPP_
 #define _RIVE_ARTBOARD_HPP_
-#include "animation/linear_animation.hpp"
-#include "animation/state_machine.hpp"
-#include "core_context.hpp"
-#include "generated/artboard_base.hpp"
-#include "math/aabb.hpp"
-#include "renderer.hpp"
-#include "shapes/shape_paint_container.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/core_context.hpp"
+#include "rive/generated/artboard_base.hpp"
+#include "rive/math/aabb.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/shape_paint_container.hpp"
 #include <vector>
 namespace rive
 {

diff --git a/include/rive/backboard.hpp b/include/rive/backboard.hpp
index 3f743ac..1dd09c5 100644
--- a/include/rive/backboard.hpp
+++ b/include/rive/backboard.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BACKBOARD_HPP_
 #define _RIVE_BACKBOARD_HPP_
-#include "generated/backboard_base.hpp"
+#include "rive/generated/backboard_base.hpp"
 namespace rive
 {
 	class Backboard : public BackboardBase

diff --git a/include/rive/bones/bone.hpp b/include/rive/bones/bone.hpp
index 5a81408..f734b4d 100644
--- a/include/rive/bones/bone.hpp
+++ b/include/rive/bones/bone.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BONE_HPP_
 #define _RIVE_BONE_HPP_
-#include "generated/bones/bone_base.hpp"
+#include "rive/generated/bones/bone_base.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/bones/cubic_weight.hpp b/include/rive/bones/cubic_weight.hpp
index f458bb9..9d46512 100644
--- a/include/rive/bones/cubic_weight.hpp
+++ b/include/rive/bones/cubic_weight.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CUBIC_WEIGHT_HPP_
 #define _RIVE_CUBIC_WEIGHT_HPP_
-#include "generated/bones/cubic_weight_base.hpp"
+#include "rive/generated/bones/cubic_weight_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/bones/root_bone.hpp b/include/rive/bones/root_bone.hpp
index ce11fce..0daae39 100644
--- a/include/rive/bones/root_bone.hpp
+++ b/include/rive/bones/root_bone.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ROOT_BONE_HPP_
 #define _RIVE_ROOT_BONE_HPP_
-#include "generated/bones/root_bone_base.hpp"
+#include "rive/generated/bones/root_bone_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/bones/skeletal_component.hpp b/include/rive/bones/skeletal_component.hpp
index 9628d4e..401bc64 100644
--- a/include/rive/bones/skeletal_component.hpp
+++ b/include/rive/bones/skeletal_component.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_SKELETAL_COMPONENT_HPP_
 #define _RIVE_SKELETAL_COMPONENT_HPP_
-#include "generated/bones/skeletal_component_base.hpp"
+#include "rive/generated/bones/skeletal_component_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/bones/skin.hpp b/include/rive/bones/skin.hpp
index eb0dc1b..4d9155e 100644
--- a/include/rive/bones/skin.hpp
+++ b/include/rive/bones/skin.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_SKIN_HPP_
 #define _RIVE_SKIN_HPP_
-#include "generated/bones/skin_base.hpp"
-#include "math/mat2d.hpp"
+#include "rive/generated/bones/skin_base.hpp"
+#include "rive/math/mat2d.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/bones/tendon.hpp b/include/rive/bones/tendon.hpp
index aee0915..a1d4eb4 100644
--- a/include/rive/bones/tendon.hpp
+++ b/include/rive/bones/tendon.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_TENDON_HPP_
 #define _RIVE_TENDON_HPP_
 
-#include "generated/bones/tendon_base.hpp"
-#include "math/mat2d.hpp"
+#include "rive/generated/bones/tendon_base.hpp"
+#include "rive/math/mat2d.hpp"
 #include <stdio.h>
 
 namespace rive

diff --git a/include/rive/bones/weight.hpp b/include/rive/bones/weight.hpp
index 8aef07d..7a14aad 100644
--- a/include/rive/bones/weight.hpp
+++ b/include/rive/bones/weight.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_WEIGHT_HPP_
 #define _RIVE_WEIGHT_HPP_
-#include "generated/bones/weight_base.hpp"
-#include "math/vec2d.hpp"
+#include "rive/generated/bones/weight_base.hpp"
+#include "rive/math/vec2d.hpp"
 #include <stdio.h>
 
 namespace rive

diff --git a/include/rive/command_path.hpp b/include/rive/command_path.hpp
index e3607cb..0d3d63e 100644
--- a/include/rive/command_path.hpp
+++ b/include/rive/command_path.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_COMMAND_PATH_HPP_
 #define _RIVE_COMMAND_PATH_HPP_
 
-#include "math/mat2d.hpp"
+#include "rive/math/mat2d.hpp"
 
 namespace rive
 {

diff --git a/include/rive/component.hpp b/include/rive/component.hpp
index 7a994f1..1916fa2 100644
--- a/include/rive/component.hpp
+++ b/include/rive/component.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_COMPONENT_HPP_
 #define _RIVE_COMPONENT_HPP_
-#include "component_dirt.hpp"
-#include "generated/component_base.hpp"
+#include "rive/component_dirt.hpp"
+#include "rive/generated/component_base.hpp"
 
 #include <vector>
 

diff --git a/include/rive/constraints/constraint.hpp b/include/rive/constraints/constraint.hpp
index 093e11d..8e3d3aa 100644
--- a/include/rive/constraints/constraint.hpp
+++ b/include/rive/constraints/constraint.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CONSTRAINT_HPP_
 #define _RIVE_CONSTRAINT_HPP_
-#include "generated/constraints/constraint_base.hpp"
+#include "rive/generated/constraints/constraint_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/constraints/distance_constraint.hpp b/include/rive/constraints/distance_constraint.hpp
index 3c2fae1..d195813 100644
--- a/include/rive/constraints/distance_constraint.hpp
+++ b/include/rive/constraints/distance_constraint.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_DISTANCE_CONSTRAINT_HPP_
 #define _RIVE_DISTANCE_CONSTRAINT_HPP_
-#include "generated/constraints/distance_constraint_base.hpp"
+#include "rive/generated/constraints/distance_constraint_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/constraints/ik_constraint.hpp b/include/rive/constraints/ik_constraint.hpp
index ecee52c..24b12a7 100644
--- a/include/rive/constraints/ik_constraint.hpp
+++ b/include/rive/constraints/ik_constraint.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_I_KCONSTRAINT_HPP_
 #define _RIVE_I_KCONSTRAINT_HPP_
-#include "generated/constraints/ik_constraint_base.hpp"
-#include "math/mat2d.hpp"
-#include "math/transform_components.hpp"
+#include "rive/generated/constraints/ik_constraint_base.hpp"
+#include "rive/math/mat2d.hpp"
+#include "rive/math/transform_components.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/constraints/targeted_constraint.hpp b/include/rive/constraints/targeted_constraint.hpp
index ae1109f..83e058a 100644
--- a/include/rive/constraints/targeted_constraint.hpp
+++ b/include/rive/constraints/targeted_constraint.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TARGETED_CONSTRAINT_HPP_
 #define _RIVE_TARGETED_CONSTRAINT_HPP_
-#include "generated/constraints/targeted_constraint_base.hpp"
+#include "rive/generated/constraints/targeted_constraint_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/constraints/transform_constraint.hpp b/include/rive/constraints/transform_constraint.hpp
index 4100e7c..20edc76 100644
--- a/include/rive/constraints/transform_constraint.hpp
+++ b/include/rive/constraints/transform_constraint.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_TRANSFORM_CONSTRAINT_HPP_
 #define _RIVE_TRANSFORM_CONSTRAINT_HPP_
-#include "generated/constraints/transform_constraint_base.hpp"
-#include "transform_space.hpp"
-#include "math/transform_components.hpp"
+#include "rive/generated/constraints/transform_constraint_base.hpp"
+#include "rive/transform_space.hpp"
+#include "rive/math/transform_components.hpp"
 
 #include <stdio.h>
 namespace rive

diff --git a/include/rive/container_component.hpp b/include/rive/container_component.hpp
index d8bd882..01d7acd 100644
--- a/include/rive/container_component.hpp
+++ b/include/rive/container_component.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CONTAINER_COMPONENT_HPP_
 #define _RIVE_CONTAINER_COMPONENT_HPP_
-#include "generated/container_component_base.hpp"
+#include "rive/generated/container_component_base.hpp"
 #include <vector>
 namespace rive
 {

diff --git a/include/rive/core.hpp b/include/rive/core.hpp
index 8177777..d38ee6a 100644
--- a/include/rive/core.hpp
+++ b/include/rive/core.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_CORE_HPP_
 #define _RIVE_CORE_HPP_
 
-#include "core/binary_reader.hpp"
-#include "status_code.hpp"
+#include "rive/core/binary_reader.hpp"
+#include "rive/status_code.hpp"
 #include <cassert>
 
 namespace rive

diff --git a/include/rive/draw_rules.hpp b/include/rive/draw_rules.hpp
index 132eada..a57c17f 100644
--- a/include/rive/draw_rules.hpp
+++ b/include/rive/draw_rules.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_DRAW_RULES_HPP_
 #define _RIVE_DRAW_RULES_HPP_
-#include "generated/draw_rules_base.hpp"
+#include "rive/generated/draw_rules_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/draw_target.hpp b/include/rive/draw_target.hpp
index 13ee2be..088a5e1 100644
--- a/include/rive/draw_target.hpp
+++ b/include/rive/draw_target.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_DRAW_TARGET_HPP_
 #define _RIVE_DRAW_TARGET_HPP_
 
-#include "draw_target_placement.hpp"
-#include "generated/draw_target_base.hpp"
+#include "rive/draw_target_placement.hpp"
+#include "rive/generated/draw_target_base.hpp"
 #include <stdio.h>
 
 namespace rive

diff --git a/include/rive/drawable.hpp b/include/rive/drawable.hpp
index 8e12041..4bd3568 100644
--- a/include/rive/drawable.hpp
+++ b/include/rive/drawable.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_DRAWABLE_HPP_
 #define _RIVE_DRAWABLE_HPP_
-#include "generated/drawable_base.hpp"
-#include "renderer.hpp"
+#include "rive/generated/drawable_base.hpp"
+#include "rive/renderer.hpp"
 #include <vector>
 
 namespace rive

diff --git a/include/rive/file.hpp b/include/rive/file.hpp
index e5fdb54..dbc0b6d 100644
--- a/include/rive/file.hpp
+++ b/include/rive/file.hpp

@@ -1,10 +1,10 @@
 #ifndef _RIVE_FILE_HPP_
 #define _RIVE_FILE_HPP_
 
-#include "artboard.hpp"
-#include "backboard.hpp"
-#include "core/binary_reader.hpp"
-#include "runtime_header.hpp"
+#include "rive/artboard.hpp"
+#include "rive/backboard.hpp"
+#include "rive/core/binary_reader.hpp"
+#include "rive/runtime_header.hpp"
 #include <vector>
 
 ///

diff --git a/include/rive/generated/animation/animation_base.hpp b/include/rive/generated/animation/animation_base.hpp
index f5dd178..05af5c7 100644
--- a/include/rive/generated/animation/animation_base.hpp
+++ b/include/rive/generated/animation/animation_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_ANIMATION_BASE_HPP_
 #define _RIVE_ANIMATION_BASE_HPP_
 #include <string>
-#include "core.hpp"
-#include "core/field_types/core_string_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_string_type.hpp"
 namespace rive
 {
 	class AnimationBase : public Core

diff --git a/include/rive/generated/animation/animation_state_base.hpp b/include/rive/generated/animation/animation_state_base.hpp
index d7565fd..e99f175 100644
--- a/include/rive/generated/animation/animation_state_base.hpp
+++ b/include/rive/generated/animation/animation_state_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_ANIMATION_STATE_BASE_HPP_
 #define _RIVE_ANIMATION_STATE_BASE_HPP_
-#include "animation/layer_state.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/layer_state.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class AnimationStateBase : public LayerState

diff --git a/include/rive/generated/animation/any_state_base.hpp b/include/rive/generated/animation/any_state_base.hpp
index 00df09c..c583f0f 100644
--- a/include/rive/generated/animation/any_state_base.hpp
+++ b/include/rive/generated/animation/any_state_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ANY_STATE_BASE_HPP_
 #define _RIVE_ANY_STATE_BASE_HPP_
-#include "animation/layer_state.hpp"
+#include "rive/animation/layer_state.hpp"
 namespace rive
 {
 	class AnyStateBase : public LayerState

diff --git a/include/rive/generated/animation/blend_animation_1d_base.hpp b/include/rive/generated/animation/blend_animation_1d_base.hpp
index 2bb02e4..8735fe4 100644
--- a/include/rive/generated/animation/blend_animation_1d_base.hpp
+++ b/include/rive/generated/animation/blend_animation_1d_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_BLEND_ANIMATION1_DBASE_HPP_
 #define _RIVE_BLEND_ANIMATION1_DBASE_HPP_
-#include "animation/blend_animation.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/animation/blend_animation.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class BlendAnimation1DBase : public BlendAnimation

diff --git a/include/rive/generated/animation/blend_animation_base.hpp b/include/rive/generated/animation/blend_animation_base.hpp
index 0926e58..b1100aa 100644
--- a/include/rive/generated/animation/blend_animation_base.hpp
+++ b/include/rive/generated/animation/blend_animation_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_BLEND_ANIMATION_BASE_HPP_
 #define _RIVE_BLEND_ANIMATION_BASE_HPP_
-#include "core.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class BlendAnimationBase : public Core

diff --git a/include/rive/generated/animation/blend_animation_direct_base.hpp b/include/rive/generated/animation/blend_animation_direct_base.hpp
index 0eaed8d..8459df3 100644
--- a/include/rive/generated/animation/blend_animation_direct_base.hpp
+++ b/include/rive/generated/animation/blend_animation_direct_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_BLEND_ANIMATION_DIRECT_BASE_HPP_
 #define _RIVE_BLEND_ANIMATION_DIRECT_BASE_HPP_
-#include "animation/blend_animation.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/blend_animation.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class BlendAnimationDirectBase : public BlendAnimation

diff --git a/include/rive/generated/animation/blend_state_1d_base.hpp b/include/rive/generated/animation/blend_state_1d_base.hpp
index acd8b56..c61ac87 100644
--- a/include/rive/generated/animation/blend_state_1d_base.hpp
+++ b/include/rive/generated/animation/blend_state_1d_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_BLEND_STATE1_DBASE_HPP_
 #define _RIVE_BLEND_STATE1_DBASE_HPP_
-#include "animation/blend_state.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/blend_state.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class BlendState1DBase : public BlendState

diff --git a/include/rive/generated/animation/blend_state_base.hpp b/include/rive/generated/animation/blend_state_base.hpp
index 7cdf3b9..c128845 100644
--- a/include/rive/generated/animation/blend_state_base.hpp
+++ b/include/rive/generated/animation/blend_state_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_STATE_BASE_HPP_
 #define _RIVE_BLEND_STATE_BASE_HPP_
-#include "animation/layer_state.hpp"
+#include "rive/animation/layer_state.hpp"
 namespace rive
 {
 	class BlendStateBase : public LayerState

diff --git a/include/rive/generated/animation/blend_state_direct_base.hpp b/include/rive/generated/animation/blend_state_direct_base.hpp
index 17d86c9..25a7622 100644
--- a/include/rive/generated/animation/blend_state_direct_base.hpp
+++ b/include/rive/generated/animation/blend_state_direct_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BLEND_STATE_DIRECT_BASE_HPP_
 #define _RIVE_BLEND_STATE_DIRECT_BASE_HPP_
-#include "animation/blend_state.hpp"
+#include "rive/animation/blend_state.hpp"
 namespace rive
 {
 	class BlendStateDirectBase : public BlendState

diff --git a/include/rive/generated/animation/blend_state_transition_base.hpp b/include/rive/generated/animation/blend_state_transition_base.hpp
index 06540ee..40c06d6 100644
--- a/include/rive/generated/animation/blend_state_transition_base.hpp
+++ b/include/rive/generated/animation/blend_state_transition_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_BLEND_STATE_TRANSITION_BASE_HPP_
 #define _RIVE_BLEND_STATE_TRANSITION_BASE_HPP_
-#include "animation/state_transition.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class BlendStateTransitionBase : public StateTransition

diff --git a/include/rive/generated/animation/cubic_interpolator_base.hpp b/include/rive/generated/animation/cubic_interpolator_base.hpp
index cfe772f..f23966f 100644
--- a/include/rive/generated/animation/cubic_interpolator_base.hpp
+++ b/include/rive/generated/animation/cubic_interpolator_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_CUBIC_INTERPOLATOR_BASE_HPP_
 #define _RIVE_CUBIC_INTERPOLATOR_BASE_HPP_
-#include "core.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class CubicInterpolatorBase : public Core

diff --git a/include/rive/generated/animation/entry_state_base.hpp b/include/rive/generated/animation/entry_state_base.hpp
index 5a13d8c..710db6d 100644
--- a/include/rive/generated/animation/entry_state_base.hpp
+++ b/include/rive/generated/animation/entry_state_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ENTRY_STATE_BASE_HPP_
 #define _RIVE_ENTRY_STATE_BASE_HPP_
-#include "animation/layer_state.hpp"
+#include "rive/animation/layer_state.hpp"
 namespace rive
 {
 	class EntryStateBase : public LayerState

diff --git a/include/rive/generated/animation/exit_state_base.hpp b/include/rive/generated/animation/exit_state_base.hpp
index 35d4b96..0a0d351 100644
--- a/include/rive/generated/animation/exit_state_base.hpp
+++ b/include/rive/generated/animation/exit_state_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_EXIT_STATE_BASE_HPP_
 #define _RIVE_EXIT_STATE_BASE_HPP_
-#include "animation/layer_state.hpp"
+#include "rive/animation/layer_state.hpp"
 namespace rive
 {
 	class ExitStateBase : public LayerState

diff --git a/include/rive/generated/animation/keyed_object_base.hpp b/include/rive/generated/animation/keyed_object_base.hpp
index 483422a..8d4e845 100644
--- a/include/rive/generated/animation/keyed_object_base.hpp
+++ b/include/rive/generated/animation/keyed_object_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEYED_OBJECT_BASE_HPP_
 #define _RIVE_KEYED_OBJECT_BASE_HPP_
-#include "core.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class KeyedObjectBase : public Core

diff --git a/include/rive/generated/animation/keyed_property_base.hpp b/include/rive/generated/animation/keyed_property_base.hpp
index f555a96..8719b51 100644
--- a/include/rive/generated/animation/keyed_property_base.hpp
+++ b/include/rive/generated/animation/keyed_property_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEYED_PROPERTY_BASE_HPP_
 #define _RIVE_KEYED_PROPERTY_BASE_HPP_
-#include "core.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class KeyedPropertyBase : public Core

diff --git a/include/rive/generated/animation/keyframe_base.hpp b/include/rive/generated/animation/keyframe_base.hpp
index 38e2206..6d9d6b4 100644
--- a/include/rive/generated/animation/keyframe_base.hpp
+++ b/include/rive/generated/animation/keyframe_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEY_FRAME_BASE_HPP_
 #define _RIVE_KEY_FRAME_BASE_HPP_
-#include "core.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class KeyFrameBase : public Core

diff --git a/include/rive/generated/animation/keyframe_color_base.hpp b/include/rive/generated/animation/keyframe_color_base.hpp
index 56c5561..4ebc90d 100644
--- a/include/rive/generated/animation/keyframe_color_base.hpp
+++ b/include/rive/generated/animation/keyframe_color_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEY_FRAME_COLOR_BASE_HPP_
 #define _RIVE_KEY_FRAME_COLOR_BASE_HPP_
-#include "animation/keyframe.hpp"
-#include "core/field_types/core_color_type.hpp"
+#include "rive/animation/keyframe.hpp"
+#include "rive/core/field_types/core_color_type.hpp"
 namespace rive
 {
 	class KeyFrameColorBase : public KeyFrame

diff --git a/include/rive/generated/animation/keyframe_double_base.hpp b/include/rive/generated/animation/keyframe_double_base.hpp
index b6b0c2f..5712aa0 100644
--- a/include/rive/generated/animation/keyframe_double_base.hpp
+++ b/include/rive/generated/animation/keyframe_double_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEY_FRAME_DOUBLE_BASE_HPP_
 #define _RIVE_KEY_FRAME_DOUBLE_BASE_HPP_
-#include "animation/keyframe.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/animation/keyframe.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class KeyFrameDoubleBase : public KeyFrame

diff --git a/include/rive/generated/animation/keyframe_id_base.hpp b/include/rive/generated/animation/keyframe_id_base.hpp
index fb0f872..d744e64 100644
--- a/include/rive/generated/animation/keyframe_id_base.hpp
+++ b/include/rive/generated/animation/keyframe_id_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEY_FRAME_ID_BASE_HPP_
 #define _RIVE_KEY_FRAME_ID_BASE_HPP_
-#include "animation/keyframe.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/keyframe.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class KeyFrameIdBase : public KeyFrame

diff --git a/include/rive/generated/animation/layer_state_base.hpp b/include/rive/generated/animation/layer_state_base.hpp
index 6058c97..6b7515e 100644
--- a/include/rive/generated/animation/layer_state_base.hpp
+++ b/include/rive/generated/animation/layer_state_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_LAYER_STATE_BASE_HPP_
 #define _RIVE_LAYER_STATE_BASE_HPP_
-#include "animation/state_machine_layer_component.hpp"
+#include "rive/animation/state_machine_layer_component.hpp"
 namespace rive
 {
 	class LayerStateBase : public StateMachineLayerComponent

diff --git a/include/rive/generated/animation/linear_animation_base.hpp b/include/rive/generated/animation/linear_animation_base.hpp
index 2cc606c..3a50d02 100644
--- a/include/rive/generated/animation/linear_animation_base.hpp
+++ b/include/rive/generated/animation/linear_animation_base.hpp

@@ -1,9 +1,9 @@
 #ifndef _RIVE_LINEAR_ANIMATION_BASE_HPP_
 #define _RIVE_LINEAR_ANIMATION_BASE_HPP_
-#include "animation/animation.hpp"
-#include "core/field_types/core_bool_type.hpp"
-#include "core/field_types/core_double_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/animation.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class LinearAnimationBase : public Animation

diff --git a/include/rive/generated/animation/state_machine_base.hpp b/include/rive/generated/animation/state_machine_base.hpp
index 521ab32..b58972a 100644
--- a/include/rive/generated/animation/state_machine_base.hpp
+++ b/include/rive/generated/animation/state_machine_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_BASE_HPP_
 #define _RIVE_STATE_MACHINE_BASE_HPP_
-#include "animation/animation.hpp"
+#include "rive/animation/animation.hpp"
 namespace rive
 {
 	class StateMachineBase : public Animation

diff --git a/include/rive/generated/animation/state_machine_bool_base.hpp b/include/rive/generated/animation/state_machine_bool_base.hpp
index 2e1847a..91a2a5b 100644
--- a/include/rive/generated/animation/state_machine_bool_base.hpp
+++ b/include/rive/generated/animation/state_machine_bool_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STATE_MACHINE_BOOL_BASE_HPP_
 #define _RIVE_STATE_MACHINE_BOOL_BASE_HPP_
-#include "animation/state_machine_input.hpp"
-#include "core/field_types/core_bool_type.hpp"
+#include "rive/animation/state_machine_input.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
 namespace rive
 {
 	class StateMachineBoolBase : public StateMachineInput

diff --git a/include/rive/generated/animation/state_machine_component_base.hpp b/include/rive/generated/animation/state_machine_component_base.hpp
index 5c7606a..952ca18 100644
--- a/include/rive/generated/animation/state_machine_component_base.hpp
+++ b/include/rive/generated/animation/state_machine_component_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_STATE_MACHINE_COMPONENT_BASE_HPP_
 #define _RIVE_STATE_MACHINE_COMPONENT_BASE_HPP_
 #include <string>
-#include "core.hpp"
-#include "core/field_types/core_string_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_string_type.hpp"
 namespace rive
 {
 	class StateMachineComponentBase : public Core

diff --git a/include/rive/generated/animation/state_machine_input_base.hpp b/include/rive/generated/animation/state_machine_input_base.hpp
index 0c42473..2f6c94b 100644
--- a/include/rive/generated/animation/state_machine_input_base.hpp
+++ b/include/rive/generated/animation/state_machine_input_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_INPUT_BASE_HPP_
 #define _RIVE_STATE_MACHINE_INPUT_BASE_HPP_
-#include "animation/state_machine_component.hpp"
+#include "rive/animation/state_machine_component.hpp"
 namespace rive
 {
 	class StateMachineInputBase : public StateMachineComponent

diff --git a/include/rive/generated/animation/state_machine_layer_base.hpp b/include/rive/generated/animation/state_machine_layer_base.hpp
index d31605a..d3d82b4 100644
--- a/include/rive/generated/animation/state_machine_layer_base.hpp
+++ b/include/rive/generated/animation/state_machine_layer_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_LAYER_BASE_HPP_
 #define _RIVE_STATE_MACHINE_LAYER_BASE_HPP_
-#include "animation/state_machine_component.hpp"
+#include "rive/animation/state_machine_component.hpp"
 namespace rive
 {
 	class StateMachineLayerBase : public StateMachineComponent

diff --git a/include/rive/generated/animation/state_machine_layer_component_base.hpp b/include/rive/generated/animation/state_machine_layer_component_base.hpp
index b332be9..5d02da5 100644
--- a/include/rive/generated/animation/state_machine_layer_component_base.hpp
+++ b/include/rive/generated/animation/state_machine_layer_component_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_LAYER_COMPONENT_BASE_HPP_
 #define _RIVE_STATE_MACHINE_LAYER_COMPONENT_BASE_HPP_
-#include "core.hpp"
+#include "rive/core.hpp"
 namespace rive
 {
 	class StateMachineLayerComponentBase : public Core

diff --git a/include/rive/generated/animation/state_machine_number_base.hpp b/include/rive/generated/animation/state_machine_number_base.hpp
index c4f2193..7979fa8 100644
--- a/include/rive/generated/animation/state_machine_number_base.hpp
+++ b/include/rive/generated/animation/state_machine_number_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STATE_MACHINE_NUMBER_BASE_HPP_
 #define _RIVE_STATE_MACHINE_NUMBER_BASE_HPP_
-#include "animation/state_machine_input.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/animation/state_machine_input.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class StateMachineNumberBase : public StateMachineInput

diff --git a/include/rive/generated/animation/state_machine_trigger_base.hpp b/include/rive/generated/animation/state_machine_trigger_base.hpp
index 4d2d27f..7a8ea20 100644
--- a/include/rive/generated/animation/state_machine_trigger_base.hpp
+++ b/include/rive/generated/animation/state_machine_trigger_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STATE_MACHINE_TRIGGER_BASE_HPP_
 #define _RIVE_STATE_MACHINE_TRIGGER_BASE_HPP_
-#include "animation/state_machine_input.hpp"
+#include "rive/animation/state_machine_input.hpp"
 namespace rive
 {
 	class StateMachineTriggerBase : public StateMachineInput

diff --git a/include/rive/generated/animation/state_transition_base.hpp b/include/rive/generated/animation/state_transition_base.hpp
index b7d519a..a74decc 100644
--- a/include/rive/generated/animation/state_transition_base.hpp
+++ b/include/rive/generated/animation/state_transition_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STATE_TRANSITION_BASE_HPP_
 #define _RIVE_STATE_TRANSITION_BASE_HPP_
-#include "animation/state_machine_layer_component.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/state_machine_layer_component.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class StateTransitionBase : public StateMachineLayerComponent

diff --git a/include/rive/generated/animation/transition_bool_condition_base.hpp b/include/rive/generated/animation/transition_bool_condition_base.hpp
index 933bbf4..66c4d2d 100644
--- a/include/rive/generated/animation/transition_bool_condition_base.hpp
+++ b/include/rive/generated/animation/transition_bool_condition_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TRANSITION_BOOL_CONDITION_BASE_HPP_
 #define _RIVE_TRANSITION_BOOL_CONDITION_BASE_HPP_
-#include "animation/transition_value_condition.hpp"
+#include "rive/animation/transition_value_condition.hpp"
 namespace rive
 {
 	class TransitionBoolConditionBase : public TransitionValueCondition

diff --git a/include/rive/generated/animation/transition_condition_base.hpp b/include/rive/generated/animation/transition_condition_base.hpp
index 2b44ce7..896b1a9 100644
--- a/include/rive/generated/animation/transition_condition_base.hpp
+++ b/include/rive/generated/animation/transition_condition_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSITION_CONDITION_BASE_HPP_
 #define _RIVE_TRANSITION_CONDITION_BASE_HPP_
-#include "core.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class TransitionConditionBase : public Core

diff --git a/include/rive/generated/animation/transition_number_condition_base.hpp b/include/rive/generated/animation/transition_number_condition_base.hpp
index d7877d0..81008cf 100644
--- a/include/rive/generated/animation/transition_number_condition_base.hpp
+++ b/include/rive/generated/animation/transition_number_condition_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSITION_NUMBER_CONDITION_BASE_HPP_
 #define _RIVE_TRANSITION_NUMBER_CONDITION_BASE_HPP_
-#include "animation/transition_value_condition.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/animation/transition_value_condition.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class TransitionNumberConditionBase : public TransitionValueCondition

diff --git a/include/rive/generated/animation/transition_trigger_condition_base.hpp b/include/rive/generated/animation/transition_trigger_condition_base.hpp
index 06bc7de..f3c50ec 100644
--- a/include/rive/generated/animation/transition_trigger_condition_base.hpp
+++ b/include/rive/generated/animation/transition_trigger_condition_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TRANSITION_TRIGGER_CONDITION_BASE_HPP_
 #define _RIVE_TRANSITION_TRIGGER_CONDITION_BASE_HPP_
-#include "animation/transition_condition.hpp"
+#include "rive/animation/transition_condition.hpp"
 namespace rive
 {
 	class TransitionTriggerConditionBase : public TransitionCondition

diff --git a/include/rive/generated/animation/transition_value_condition_base.hpp b/include/rive/generated/animation/transition_value_condition_base.hpp
index 38caa6a..022064c 100644
--- a/include/rive/generated/animation/transition_value_condition_base.hpp
+++ b/include/rive/generated/animation/transition_value_condition_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSITION_VALUE_CONDITION_BASE_HPP_
 #define _RIVE_TRANSITION_VALUE_CONDITION_BASE_HPP_
-#include "animation/transition_condition.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/animation/transition_condition.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class TransitionValueConditionBase : public TransitionCondition

diff --git a/include/rive/generated/artboard_base.hpp b/include/rive/generated/artboard_base.hpp
index 14b5b5e..e6229bb 100644
--- a/include/rive/generated/artboard_base.hpp
+++ b/include/rive/generated/artboard_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_ARTBOARD_BASE_HPP_
 #define _RIVE_ARTBOARD_BASE_HPP_
-#include "container_component.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class ArtboardBase : public ContainerComponent

diff --git a/include/rive/generated/backboard_base.hpp b/include/rive/generated/backboard_base.hpp
index 28d95d7..60e37f3 100644
--- a/include/rive/generated/backboard_base.hpp
+++ b/include/rive/generated/backboard_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_BACKBOARD_BASE_HPP_
 #define _RIVE_BACKBOARD_BASE_HPP_
-#include "core.hpp"
+#include "rive/core.hpp"
 namespace rive
 {
 	class BackboardBase : public Core

diff --git a/include/rive/generated/bones/bone_base.hpp b/include/rive/generated/bones/bone_base.hpp
index 8ebf1c9..e6df26e 100644
--- a/include/rive/generated/bones/bone_base.hpp
+++ b/include/rive/generated/bones/bone_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_BONE_BASE_HPP_
 #define _RIVE_BONE_BASE_HPP_
-#include "bones/skeletal_component.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/bones/skeletal_component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class BoneBase : public SkeletalComponent

diff --git a/include/rive/generated/bones/cubic_weight_base.hpp b/include/rive/generated/bones/cubic_weight_base.hpp
index fbc0954..19dbc97 100644
--- a/include/rive/generated/bones/cubic_weight_base.hpp
+++ b/include/rive/generated/bones/cubic_weight_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_CUBIC_WEIGHT_BASE_HPP_
 #define _RIVE_CUBIC_WEIGHT_BASE_HPP_
-#include "bones/weight.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/bones/weight.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class CubicWeightBase : public Weight

diff --git a/include/rive/generated/bones/root_bone_base.hpp b/include/rive/generated/bones/root_bone_base.hpp
index 464d165..8c869ef 100644
--- a/include/rive/generated/bones/root_bone_base.hpp
+++ b/include/rive/generated/bones/root_bone_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_ROOT_BONE_BASE_HPP_
 #define _RIVE_ROOT_BONE_BASE_HPP_
-#include "bones/bone.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/bones/bone.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class RootBoneBase : public Bone

diff --git a/include/rive/generated/bones/skeletal_component_base.hpp b/include/rive/generated/bones/skeletal_component_base.hpp
index 36fb59b..f31fe37 100644
--- a/include/rive/generated/bones/skeletal_component_base.hpp
+++ b/include/rive/generated/bones/skeletal_component_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_SKELETAL_COMPONENT_BASE_HPP_
 #define _RIVE_SKELETAL_COMPONENT_BASE_HPP_
-#include "transform_component.hpp"
+#include "rive/transform_component.hpp"
 namespace rive
 {
 	class SkeletalComponentBase : public TransformComponent

diff --git a/include/rive/generated/bones/skin_base.hpp b/include/rive/generated/bones/skin_base.hpp
index 7a5aa99..0126a8e 100644
--- a/include/rive/generated/bones/skin_base.hpp
+++ b/include/rive/generated/bones/skin_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_SKIN_BASE_HPP_
 #define _RIVE_SKIN_BASE_HPP_
-#include "container_component.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class SkinBase : public ContainerComponent

diff --git a/include/rive/generated/bones/tendon_base.hpp b/include/rive/generated/bones/tendon_base.hpp
index 164b720..b80bb0b 100644
--- a/include/rive/generated/bones/tendon_base.hpp
+++ b/include/rive/generated/bones/tendon_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_TENDON_BASE_HPP_
 #define _RIVE_TENDON_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_double_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class TendonBase : public Component

diff --git a/include/rive/generated/bones/weight_base.hpp b/include/rive/generated/bones/weight_base.hpp
index d3b9ef6..602db43 100644
--- a/include/rive/generated/bones/weight_base.hpp
+++ b/include/rive/generated/bones/weight_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_WEIGHT_BASE_HPP_
 #define _RIVE_WEIGHT_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class WeightBase : public Component

diff --git a/include/rive/generated/component_base.hpp b/include/rive/generated/component_base.hpp
index 14cc189..b08927b 100644
--- a/include/rive/generated/component_base.hpp
+++ b/include/rive/generated/component_base.hpp

@@ -1,9 +1,9 @@
 #ifndef _RIVE_COMPONENT_BASE_HPP_
 #define _RIVE_COMPONENT_BASE_HPP_
 #include <string>
-#include "core.hpp"
-#include "core/field_types/core_string_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/core.hpp"
+#include "rive/core/field_types/core_string_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class ComponentBase : public Core

diff --git a/include/rive/generated/constraints/constraint_base.hpp b/include/rive/generated/constraints/constraint_base.hpp
index c0f54b8..5f4d3b5 100644
--- a/include/rive/generated/constraints/constraint_base.hpp
+++ b/include/rive/generated/constraints/constraint_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_CONSTRAINT_BASE_HPP_
 #define _RIVE_CONSTRAINT_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class ConstraintBase : public Component

diff --git a/include/rive/generated/constraints/distance_constraint_base.hpp b/include/rive/generated/constraints/distance_constraint_base.hpp
index 070d0d0..fa96847 100644
--- a/include/rive/generated/constraints/distance_constraint_base.hpp
+++ b/include/rive/generated/constraints/distance_constraint_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_DISTANCE_CONSTRAINT_BASE_HPP_
 #define _RIVE_DISTANCE_CONSTRAINT_BASE_HPP_
-#include "constraints/targeted_constraint.hpp"
-#include "core/field_types/core_double_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/constraints/targeted_constraint.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class DistanceConstraintBase : public TargetedConstraint

diff --git a/include/rive/generated/constraints/ik_constraint_base.hpp b/include/rive/generated/constraints/ik_constraint_base.hpp
index 17da978..3029c4e 100644
--- a/include/rive/generated/constraints/ik_constraint_base.hpp
+++ b/include/rive/generated/constraints/ik_constraint_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_I_KCONSTRAINT_BASE_HPP_
 #define _RIVE_I_KCONSTRAINT_BASE_HPP_
-#include "constraints/targeted_constraint.hpp"
-#include "core/field_types/core_bool_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/constraints/targeted_constraint.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class IKConstraintBase : public TargetedConstraint

diff --git a/include/rive/generated/constraints/targeted_constraint_base.hpp b/include/rive/generated/constraints/targeted_constraint_base.hpp
index b10d99c..192991a 100644
--- a/include/rive/generated/constraints/targeted_constraint_base.hpp
+++ b/include/rive/generated/constraints/targeted_constraint_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TARGETED_CONSTRAINT_BASE_HPP_
 #define _RIVE_TARGETED_CONSTRAINT_BASE_HPP_
-#include "constraints/constraint.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/constraints/constraint.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class TargetedConstraintBase : public Constraint

diff --git a/include/rive/generated/constraints/transform_constraint_base.hpp b/include/rive/generated/constraints/transform_constraint_base.hpp
index aa85a2a..9a71ce8 100644
--- a/include/rive/generated/constraints/transform_constraint_base.hpp
+++ b/include/rive/generated/constraints/transform_constraint_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSFORM_CONSTRAINT_BASE_HPP_
 #define _RIVE_TRANSFORM_CONSTRAINT_BASE_HPP_
-#include "constraints/targeted_constraint.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/constraints/targeted_constraint.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class TransformConstraintBase : public TargetedConstraint

diff --git a/include/rive/generated/container_component_base.hpp b/include/rive/generated/container_component_base.hpp
index 25cc2c0..f57c81d 100644
--- a/include/rive/generated/container_component_base.hpp
+++ b/include/rive/generated/container_component_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CONTAINER_COMPONENT_BASE_HPP_
 #define _RIVE_CONTAINER_COMPONENT_BASE_HPP_
-#include "component.hpp"
+#include "rive/component.hpp"
 namespace rive
 {
 	class ContainerComponentBase : public Component

diff --git a/include/rive/generated/core_registry.hpp b/include/rive/generated/core_registry.hpp
index cd04bc5..edc1515 100644
--- a/include/rive/generated/core_registry.hpp
+++ b/include/rive/generated/core_registry.hpp

@@ -1,85 +1,85 @@
 #ifndef _RIVE_CORE_REGISTRY_HPP_
 #define _RIVE_CORE_REGISTRY_HPP_
-#include "animation/animation.hpp"
-#include "animation/animation_state.hpp"
-#include "animation/any_state.hpp"
-#include "animation/blend_animation.hpp"
-#include "animation/blend_animation_1d.hpp"
-#include "animation/blend_animation_direct.hpp"
-#include "animation/blend_state.hpp"
-#include "animation/blend_state_1d.hpp"
-#include "animation/blend_state_direct.hpp"
-#include "animation/blend_state_transition.hpp"
-#include "animation/cubic_interpolator.hpp"
-#include "animation/entry_state.hpp"
-#include "animation/exit_state.hpp"
-#include "animation/keyed_object.hpp"
-#include "animation/keyed_property.hpp"
-#include "animation/keyframe.hpp"
-#include "animation/keyframe_color.hpp"
-#include "animation/keyframe_double.hpp"
-#include "animation/keyframe_id.hpp"
-#include "animation/layer_state.hpp"
-#include "animation/linear_animation.hpp"
-#include "animation/state_machine.hpp"
-#include "animation/state_machine_bool.hpp"
-#include "animation/state_machine_component.hpp"
-#include "animation/state_machine_input.hpp"
-#include "animation/state_machine_layer.hpp"
-#include "animation/state_machine_layer_component.hpp"
-#include "animation/state_machine_number.hpp"
-#include "animation/state_machine_trigger.hpp"
-#include "animation/state_transition.hpp"
-#include "animation/transition_bool_condition.hpp"
-#include "animation/transition_condition.hpp"
-#include "animation/transition_number_condition.hpp"
-#include "animation/transition_trigger_condition.hpp"
-#include "animation/transition_value_condition.hpp"
-#include "artboard.hpp"
-#include "backboard.hpp"
-#include "bones/bone.hpp"
-#include "bones/cubic_weight.hpp"
-#include "bones/root_bone.hpp"
-#include "bones/skeletal_component.hpp"
-#include "bones/skin.hpp"
-#include "bones/tendon.hpp"
-#include "bones/weight.hpp"
-#include "component.hpp"
-#include "constraints/constraint.hpp"
-#include "constraints/distance_constraint.hpp"
-#include "constraints/ik_constraint.hpp"
-#include "constraints/targeted_constraint.hpp"
-#include "constraints/transform_constraint.hpp"
-#include "container_component.hpp"
-#include "draw_rules.hpp"
-#include "draw_target.hpp"
-#include "drawable.hpp"
-#include "node.hpp"
-#include "shapes/clipping_shape.hpp"
-#include "shapes/cubic_asymmetric_vertex.hpp"
-#include "shapes/cubic_detached_vertex.hpp"
-#include "shapes/cubic_mirrored_vertex.hpp"
-#include "shapes/cubic_vertex.hpp"
-#include "shapes/ellipse.hpp"
-#include "shapes/paint/fill.hpp"
-#include "shapes/paint/gradient_stop.hpp"
-#include "shapes/paint/linear_gradient.hpp"
-#include "shapes/paint/radial_gradient.hpp"
-#include "shapes/paint/shape_paint.hpp"
-#include "shapes/paint/solid_color.hpp"
-#include "shapes/paint/stroke.hpp"
-#include "shapes/paint/trim_path.hpp"
-#include "shapes/parametric_path.hpp"
-#include "shapes/path.hpp"
-#include "shapes/path_vertex.hpp"
-#include "shapes/points_path.hpp"
-#include "shapes/polygon.hpp"
-#include "shapes/rectangle.hpp"
-#include "shapes/shape.hpp"
-#include "shapes/star.hpp"
-#include "shapes/straight_vertex.hpp"
-#include "shapes/triangle.hpp"
-#include "transform_component.hpp"
+#include "rive/animation/animation.hpp"
+#include "rive/animation/animation_state.hpp"
+#include "rive/animation/any_state.hpp"
+#include "rive/animation/blend_animation.hpp"
+#include "rive/animation/blend_animation_1d.hpp"
+#include "rive/animation/blend_animation_direct.hpp"
+#include "rive/animation/blend_state.hpp"
+#include "rive/animation/blend_state_1d.hpp"
+#include "rive/animation/blend_state_direct.hpp"
+#include "rive/animation/blend_state_transition.hpp"
+#include "rive/animation/cubic_interpolator.hpp"
+#include "rive/animation/entry_state.hpp"
+#include "rive/animation/exit_state.hpp"
+#include "rive/animation/keyed_object.hpp"
+#include "rive/animation/keyed_property.hpp"
+#include "rive/animation/keyframe.hpp"
+#include "rive/animation/keyframe_color.hpp"
+#include "rive/animation/keyframe_double.hpp"
+#include "rive/animation/keyframe_id.hpp"
+#include "rive/animation/layer_state.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/animation/state_machine_bool.hpp"
+#include "rive/animation/state_machine_component.hpp"
+#include "rive/animation/state_machine_input.hpp"
+#include "rive/animation/state_machine_layer.hpp"
+#include "rive/animation/state_machine_layer_component.hpp"
+#include "rive/animation/state_machine_number.hpp"
+#include "rive/animation/state_machine_trigger.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/animation/transition_bool_condition.hpp"
+#include "rive/animation/transition_condition.hpp"
+#include "rive/animation/transition_number_condition.hpp"
+#include "rive/animation/transition_trigger_condition.hpp"
+#include "rive/animation/transition_value_condition.hpp"
+#include "rive/artboard.hpp"
+#include "rive/backboard.hpp"
+#include "rive/bones/bone.hpp"
+#include "rive/bones/cubic_weight.hpp"
+#include "rive/bones/root_bone.hpp"
+#include "rive/bones/skeletal_component.hpp"
+#include "rive/bones/skin.hpp"
+#include "rive/bones/tendon.hpp"
+#include "rive/bones/weight.hpp"
+#include "rive/component.hpp"
+#include "rive/constraints/constraint.hpp"
+#include "rive/constraints/distance_constraint.hpp"
+#include "rive/constraints/ik_constraint.hpp"
+#include "rive/constraints/targeted_constraint.hpp"
+#include "rive/constraints/transform_constraint.hpp"
+#include "rive/container_component.hpp"
+#include "rive/draw_rules.hpp"
+#include "rive/draw_target.hpp"
+#include "rive/drawable.hpp"
+#include "rive/node.hpp"
+#include "rive/shapes/clipping_shape.hpp"
+#include "rive/shapes/cubic_asymmetric_vertex.hpp"
+#include "rive/shapes/cubic_detached_vertex.hpp"
+#include "rive/shapes/cubic_mirrored_vertex.hpp"
+#include "rive/shapes/cubic_vertex.hpp"
+#include "rive/shapes/ellipse.hpp"
+#include "rive/shapes/paint/fill.hpp"
+#include "rive/shapes/paint/gradient_stop.hpp"
+#include "rive/shapes/paint/linear_gradient.hpp"
+#include "rive/shapes/paint/radial_gradient.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
+#include "rive/shapes/paint/solid_color.hpp"
+#include "rive/shapes/paint/stroke.hpp"
+#include "rive/shapes/paint/trim_path.hpp"
+#include "rive/shapes/parametric_path.hpp"
+#include "rive/shapes/path.hpp"
+#include "rive/shapes/path_vertex.hpp"
+#include "rive/shapes/points_path.hpp"
+#include "rive/shapes/polygon.hpp"
+#include "rive/shapes/rectangle.hpp"
+#include "rive/shapes/shape.hpp"
+#include "rive/shapes/star.hpp"
+#include "rive/shapes/straight_vertex.hpp"
+#include "rive/shapes/triangle.hpp"
+#include "rive/transform_component.hpp"
 namespace rive
 {
 	class CoreRegistry

diff --git a/include/rive/generated/draw_rules_base.hpp b/include/rive/generated/draw_rules_base.hpp
index 03cc549..c458e66 100644
--- a/include/rive/generated/draw_rules_base.hpp
+++ b/include/rive/generated/draw_rules_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_DRAW_RULES_BASE_HPP_
 #define _RIVE_DRAW_RULES_BASE_HPP_
-#include "container_component.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class DrawRulesBase : public ContainerComponent

diff --git a/include/rive/generated/draw_target_base.hpp b/include/rive/generated/draw_target_base.hpp
index 433ba2b..3dd2971 100644
--- a/include/rive/generated/draw_target_base.hpp
+++ b/include/rive/generated/draw_target_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_DRAW_TARGET_BASE_HPP_
 #define _RIVE_DRAW_TARGET_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class DrawTargetBase : public Component

diff --git a/include/rive/generated/drawable_base.hpp b/include/rive/generated/drawable_base.hpp
index 0d2d3c8..c545f1f 100644
--- a/include/rive/generated/drawable_base.hpp
+++ b/include/rive/generated/drawable_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_DRAWABLE_BASE_HPP_
 #define _RIVE_DRAWABLE_BASE_HPP_
-#include "core/field_types/core_uint_type.hpp"
-#include "node.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
+#include "rive/node.hpp"
 namespace rive
 {
 	class DrawableBase : public Node

diff --git a/include/rive/generated/node_base.hpp b/include/rive/generated/node_base.hpp
index c35e3ce..1bcbb43 100644
--- a/include/rive/generated/node_base.hpp
+++ b/include/rive/generated/node_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_NODE_BASE_HPP_
 #define _RIVE_NODE_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "transform_component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/transform_component.hpp"
 namespace rive
 {
 	class NodeBase : public TransformComponent

diff --git a/include/rive/generated/shapes/clipping_shape_base.hpp b/include/rive/generated/shapes/clipping_shape_base.hpp
index b20053d..309fb85 100644
--- a/include/rive/generated/shapes/clipping_shape_base.hpp
+++ b/include/rive/generated/shapes/clipping_shape_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_CLIPPING_SHAPE_BASE_HPP_
 #define _RIVE_CLIPPING_SHAPE_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_bool_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class ClippingShapeBase : public Component

diff --git a/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp b/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp
index 5321542..9d4c08b 100644
--- a/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp
+++ b/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_CUBIC_ASYMMETRIC_VERTEX_BASE_HPP_
 #define _RIVE_CUBIC_ASYMMETRIC_VERTEX_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "shapes/cubic_vertex.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/shapes/cubic_vertex.hpp"
 namespace rive
 {
 	class CubicAsymmetricVertexBase : public CubicVertex

diff --git a/include/rive/generated/shapes/cubic_detached_vertex_base.hpp b/include/rive/generated/shapes/cubic_detached_vertex_base.hpp
index 9a22ce4..279392c 100644
--- a/include/rive/generated/shapes/cubic_detached_vertex_base.hpp
+++ b/include/rive/generated/shapes/cubic_detached_vertex_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_CUBIC_DETACHED_VERTEX_BASE_HPP_
 #define _RIVE_CUBIC_DETACHED_VERTEX_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "shapes/cubic_vertex.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/shapes/cubic_vertex.hpp"
 namespace rive
 {
 	class CubicDetachedVertexBase : public CubicVertex

diff --git a/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp b/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp
index 6fbd49e..ff5bce8 100644
--- a/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp
+++ b/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_CUBIC_MIRRORED_VERTEX_BASE_HPP_
 #define _RIVE_CUBIC_MIRRORED_VERTEX_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "shapes/cubic_vertex.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/shapes/cubic_vertex.hpp"
 namespace rive
 {
 	class CubicMirroredVertexBase : public CubicVertex

diff --git a/include/rive/generated/shapes/cubic_vertex_base.hpp b/include/rive/generated/shapes/cubic_vertex_base.hpp
index fa739d9..760bdff 100644
--- a/include/rive/generated/shapes/cubic_vertex_base.hpp
+++ b/include/rive/generated/shapes/cubic_vertex_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CUBIC_VERTEX_BASE_HPP_
 #define _RIVE_CUBIC_VERTEX_BASE_HPP_
-#include "shapes/path_vertex.hpp"
+#include "rive/shapes/path_vertex.hpp"
 namespace rive
 {
 	class CubicVertexBase : public PathVertex

diff --git a/include/rive/generated/shapes/ellipse_base.hpp b/include/rive/generated/shapes/ellipse_base.hpp
index 3c17515..ad90986 100644
--- a/include/rive/generated/shapes/ellipse_base.hpp
+++ b/include/rive/generated/shapes/ellipse_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_ELLIPSE_BASE_HPP_
 #define _RIVE_ELLIPSE_BASE_HPP_
-#include "shapes/parametric_path.hpp"
+#include "rive/shapes/parametric_path.hpp"
 namespace rive
 {
 	class EllipseBase : public ParametricPath

diff --git a/include/rive/generated/shapes/paint/fill_base.hpp b/include/rive/generated/shapes/paint/fill_base.hpp
index 06fbebf..922f4ce 100644
--- a/include/rive/generated/shapes/paint/fill_base.hpp
+++ b/include/rive/generated/shapes/paint/fill_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_FILL_BASE_HPP_
 #define _RIVE_FILL_BASE_HPP_
-#include "core/field_types/core_uint_type.hpp"
-#include "shapes/paint/shape_paint.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
 namespace rive
 {
 	class FillBase : public ShapePaint

diff --git a/include/rive/generated/shapes/paint/gradient_stop_base.hpp b/include/rive/generated/shapes/paint/gradient_stop_base.hpp
index 97757ae..bd79ff1 100644
--- a/include/rive/generated/shapes/paint/gradient_stop_base.hpp
+++ b/include/rive/generated/shapes/paint/gradient_stop_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_GRADIENT_STOP_BASE_HPP_
 #define _RIVE_GRADIENT_STOP_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_color_type.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_color_type.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class GradientStopBase : public Component

diff --git a/include/rive/generated/shapes/paint/linear_gradient_base.hpp b/include/rive/generated/shapes/paint/linear_gradient_base.hpp
index 4182afb..99555e4 100644
--- a/include/rive/generated/shapes/paint/linear_gradient_base.hpp
+++ b/include/rive/generated/shapes/paint/linear_gradient_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_LINEAR_GRADIENT_BASE_HPP_
 #define _RIVE_LINEAR_GRADIENT_BASE_HPP_
-#include "container_component.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class LinearGradientBase : public ContainerComponent

diff --git a/include/rive/generated/shapes/paint/radial_gradient_base.hpp b/include/rive/generated/shapes/paint/radial_gradient_base.hpp
index ae53822..bf4c734 100644
--- a/include/rive/generated/shapes/paint/radial_gradient_base.hpp
+++ b/include/rive/generated/shapes/paint/radial_gradient_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_RADIAL_GRADIENT_BASE_HPP_
 #define _RIVE_RADIAL_GRADIENT_BASE_HPP_
-#include "shapes/paint/linear_gradient.hpp"
+#include "rive/shapes/paint/linear_gradient.hpp"
 namespace rive
 {
 	class RadialGradientBase : public LinearGradient

diff --git a/include/rive/generated/shapes/paint/shape_paint_base.hpp b/include/rive/generated/shapes/paint/shape_paint_base.hpp
index 09cbfb0..57a6474 100644
--- a/include/rive/generated/shapes/paint/shape_paint_base.hpp
+++ b/include/rive/generated/shapes/paint/shape_paint_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_SHAPE_PAINT_BASE_HPP_
 #define _RIVE_SHAPE_PAINT_BASE_HPP_
-#include "container_component.hpp"
-#include "core/field_types/core_bool_type.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
 namespace rive
 {
 	class ShapePaintBase : public ContainerComponent

diff --git a/include/rive/generated/shapes/paint/solid_color_base.hpp b/include/rive/generated/shapes/paint/solid_color_base.hpp
index f233265..8afe588 100644
--- a/include/rive/generated/shapes/paint/solid_color_base.hpp
+++ b/include/rive/generated/shapes/paint/solid_color_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_SOLID_COLOR_BASE_HPP_
 #define _RIVE_SOLID_COLOR_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_color_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_color_type.hpp"
 namespace rive
 {
 	class SolidColorBase : public Component

diff --git a/include/rive/generated/shapes/paint/stroke_base.hpp b/include/rive/generated/shapes/paint/stroke_base.hpp
index 8615ffa..bd42a93 100644
--- a/include/rive/generated/shapes/paint/stroke_base.hpp
+++ b/include/rive/generated/shapes/paint/stroke_base.hpp

@@ -1,9 +1,9 @@
 #ifndef _RIVE_STROKE_BASE_HPP_
 #define _RIVE_STROKE_BASE_HPP_
-#include "core/field_types/core_bool_type.hpp"
-#include "core/field_types/core_double_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
-#include "shapes/paint/shape_paint.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
 namespace rive
 {
 	class StrokeBase : public ShapePaint

diff --git a/include/rive/generated/shapes/paint/trim_path_base.hpp b/include/rive/generated/shapes/paint/trim_path_base.hpp
index 3c52eeb..80d980c 100644
--- a/include/rive/generated/shapes/paint/trim_path_base.hpp
+++ b/include/rive/generated/shapes/paint/trim_path_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_TRIM_PATH_BASE_HPP_
 #define _RIVE_TRIM_PATH_BASE_HPP_
-#include "component.hpp"
-#include "core/field_types/core_double_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
+#include "rive/component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
 namespace rive
 {
 	class TrimPathBase : public Component

diff --git a/include/rive/generated/shapes/parametric_path_base.hpp b/include/rive/generated/shapes/parametric_path_base.hpp
index dfb8a93..1c4ef80 100644
--- a/include/rive/generated/shapes/parametric_path_base.hpp
+++ b/include/rive/generated/shapes/parametric_path_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_PARAMETRIC_PATH_BASE_HPP_
 #define _RIVE_PARAMETRIC_PATH_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "shapes/path.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/shapes/path.hpp"
 namespace rive
 {
 	class ParametricPathBase : public Path

diff --git a/include/rive/generated/shapes/path_base.hpp b/include/rive/generated/shapes/path_base.hpp
index 49475b1..6138190 100644
--- a/include/rive/generated/shapes/path_base.hpp
+++ b/include/rive/generated/shapes/path_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_PATH_BASE_HPP_
 #define _RIVE_PATH_BASE_HPP_
-#include "core/field_types/core_uint_type.hpp"
-#include "node.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
+#include "rive/node.hpp"
 namespace rive
 {
 	class PathBase : public Node

diff --git a/include/rive/generated/shapes/path_vertex_base.hpp b/include/rive/generated/shapes/path_vertex_base.hpp
index 3502557..8af2cf1 100644
--- a/include/rive/generated/shapes/path_vertex_base.hpp
+++ b/include/rive/generated/shapes/path_vertex_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_PATH_VERTEX_BASE_HPP_
 #define _RIVE_PATH_VERTEX_BASE_HPP_
-#include "container_component.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class PathVertexBase : public ContainerComponent

diff --git a/include/rive/generated/shapes/points_path_base.hpp b/include/rive/generated/shapes/points_path_base.hpp
index f852e11..5bf78d8 100644
--- a/include/rive/generated/shapes/points_path_base.hpp
+++ b/include/rive/generated/shapes/points_path_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_POINTS_PATH_BASE_HPP_
 #define _RIVE_POINTS_PATH_BASE_HPP_
-#include "core/field_types/core_bool_type.hpp"
-#include "shapes/path.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
+#include "rive/shapes/path.hpp"
 namespace rive
 {
 	class PointsPathBase : public Path

diff --git a/include/rive/generated/shapes/polygon_base.hpp b/include/rive/generated/shapes/polygon_base.hpp
index a0795f8..dfb3f84 100644
--- a/include/rive/generated/shapes/polygon_base.hpp
+++ b/include/rive/generated/shapes/polygon_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_POLYGON_BASE_HPP_
 #define _RIVE_POLYGON_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
-#include "shapes/parametric_path.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
+#include "rive/shapes/parametric_path.hpp"
 namespace rive
 {
 	class PolygonBase : public ParametricPath

diff --git a/include/rive/generated/shapes/rectangle_base.hpp b/include/rive/generated/shapes/rectangle_base.hpp
index 3c69947..697f2ed 100644
--- a/include/rive/generated/shapes/rectangle_base.hpp
+++ b/include/rive/generated/shapes/rectangle_base.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_RECTANGLE_BASE_HPP_
 #define _RIVE_RECTANGLE_BASE_HPP_
-#include "core/field_types/core_bool_type.hpp"
-#include "core/field_types/core_double_type.hpp"
-#include "shapes/parametric_path.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/shapes/parametric_path.hpp"
 namespace rive
 {
 	class RectangleBase : public ParametricPath

diff --git a/include/rive/generated/shapes/shape_base.hpp b/include/rive/generated/shapes/shape_base.hpp
index f77705d..a705749 100644
--- a/include/rive/generated/shapes/shape_base.hpp
+++ b/include/rive/generated/shapes/shape_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_SHAPE_BASE_HPP_
 #define _RIVE_SHAPE_BASE_HPP_
-#include "drawable.hpp"
+#include "rive/drawable.hpp"
 namespace rive
 {
 	class ShapeBase : public Drawable

diff --git a/include/rive/generated/shapes/star_base.hpp b/include/rive/generated/shapes/star_base.hpp
index b04e871..ae0d615 100644
--- a/include/rive/generated/shapes/star_base.hpp
+++ b/include/rive/generated/shapes/star_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STAR_BASE_HPP_
 #define _RIVE_STAR_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "shapes/polygon.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/shapes/polygon.hpp"
 namespace rive
 {
 	class StarBase : public Polygon

diff --git a/include/rive/generated/shapes/straight_vertex_base.hpp b/include/rive/generated/shapes/straight_vertex_base.hpp
index 7db29d7..a1259b8 100644
--- a/include/rive/generated/shapes/straight_vertex_base.hpp
+++ b/include/rive/generated/shapes/straight_vertex_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STRAIGHT_VERTEX_BASE_HPP_
 #define _RIVE_STRAIGHT_VERTEX_BASE_HPP_
-#include "core/field_types/core_double_type.hpp"
-#include "shapes/path_vertex.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/shapes/path_vertex.hpp"
 namespace rive
 {
 	class StraightVertexBase : public PathVertex

diff --git a/include/rive/generated/shapes/triangle_base.hpp b/include/rive/generated/shapes/triangle_base.hpp
index 4102b1b..1078889 100644
--- a/include/rive/generated/shapes/triangle_base.hpp
+++ b/include/rive/generated/shapes/triangle_base.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_TRIANGLE_BASE_HPP_
 #define _RIVE_TRIANGLE_BASE_HPP_
-#include "shapes/parametric_path.hpp"
+#include "rive/shapes/parametric_path.hpp"
 namespace rive
 {
 	class TriangleBase : public ParametricPath

diff --git a/include/rive/generated/transform_component_base.hpp b/include/rive/generated/transform_component_base.hpp
index 9f19f69..b85a64f 100644
--- a/include/rive/generated/transform_component_base.hpp
+++ b/include/rive/generated/transform_component_base.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSFORM_COMPONENT_BASE_HPP_
 #define _RIVE_TRANSFORM_COMPONENT_BASE_HPP_
-#include "container_component.hpp"
-#include "core/field_types/core_double_type.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
 namespace rive
 {
 	class TransformComponentBase : public ContainerComponent

diff --git a/include/rive/importers/artboard_importer.hpp b/include/rive/importers/artboard_importer.hpp
index 9db5f78..0518372 100644
--- a/include/rive/importers/artboard_importer.hpp
+++ b/include/rive/importers/artboard_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_ARTBOARD_IMPORTER_HPP_
 #define _RIVE_ARTBOARD_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/importers/import_stack.hpp b/include/rive/importers/import_stack.hpp
index f31a49e..e3fd3b1 100644
--- a/include/rive/importers/import_stack.hpp
+++ b/include/rive/importers/import_stack.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_IMPORT_STACK_HPP_
 #define _RIVE_IMPORT_STACK_HPP_
-#include "status_code.hpp"
+#include "rive/status_code.hpp"
 #include <algorithm>
 #include <unordered_map>
 #include <vector>

diff --git a/include/rive/importers/keyed_object_importer.hpp b/include/rive/importers/keyed_object_importer.hpp
index 57845e8..dc0b70d 100644
--- a/include/rive/importers/keyed_object_importer.hpp
+++ b/include/rive/importers/keyed_object_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEYED_OBJECT_IMPORTER_HPP_
 #define _RIVE_KEYED_OBJECT_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/importers/keyed_property_importer.hpp b/include/rive/importers/keyed_property_importer.hpp
index 286772d..a4b581e 100644
--- a/include/rive/importers/keyed_property_importer.hpp
+++ b/include/rive/importers/keyed_property_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_KEYED_PROPERTY_IMPORTER_HPP_
 #define _RIVE_KEYED_PROPERTY_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/importers/layer_state_importer.hpp b/include/rive/importers/layer_state_importer.hpp
index 6212e82..9f3a9dc 100644
--- a/include/rive/importers/layer_state_importer.hpp
+++ b/include/rive/importers/layer_state_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_LAYER_STATE_IMPORTER_HPP_
 #define _RIVE_LAYER_STATE_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/importers/linear_animation_importer.hpp b/include/rive/importers/linear_animation_importer.hpp
index 09ee94c..74857f0 100644
--- a/include/rive/importers/linear_animation_importer.hpp
+++ b/include/rive/importers/linear_animation_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_LINEAR_ANIMATION_IMPORTER_HPP_
 #define _RIVE_LINEAR_ANIMATION_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/importers/state_machine_importer.hpp b/include/rive/importers/state_machine_importer.hpp
index 7ab487b..eb4eb6b 100644
--- a/include/rive/importers/state_machine_importer.hpp
+++ b/include/rive/importers/state_machine_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STATE_MACHINE_IMPORTER_HPP_
 #define _RIVE_STATE_MACHINE_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/importers/state_machine_layer_importer.hpp b/include/rive/importers/state_machine_layer_importer.hpp
index c8e666a..36363e3 100644
--- a/include/rive/importers/state_machine_layer_importer.hpp
+++ b/include/rive/importers/state_machine_layer_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STATE_MACHINE_LAYER_IMPORTER_HPP_
 #define _RIVE_STATE_MACHINE_LAYER_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/importers/state_transition_importer.hpp b/include/rive/importers/state_transition_importer.hpp
index 1779f5c..2094b6f 100644
--- a/include/rive/importers/state_transition_importer.hpp
+++ b/include/rive/importers/state_transition_importer.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSITION_IMPORTER_HPP_
 #define _RIVE_TRANSITION_IMPORTER_HPP_
 
-#include "importers/import_stack.hpp"
+#include "rive/importers/import_stack.hpp"
 
 namespace rive
 {

diff --git a/include/rive/math/aabb.hpp b/include/rive/math/aabb.hpp
index 1824756..c9123cd 100644
--- a/include/rive/math/aabb.hpp
+++ b/include/rive/math/aabb.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_AABB_HPP_
 #define _RIVE_AABB_HPP_
 
-#include "mat2d.hpp"
-#include "vec2d.hpp"
+#include "rive/math/mat2d.hpp"
+#include "rive/math/vec2d.hpp"
 #include <cstddef>
 
 namespace rive

diff --git a/include/rive/math/transform_components.hpp b/include/rive/math/transform_components.hpp
index 1fc5249..a38b226 100644
--- a/include/rive/math/transform_components.hpp
+++ b/include/rive/math/transform_components.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSFORMCOMPONENTS_HPP_
 #define _RIVE_TRANSFORMCOMPONENTS_HPP_
 
-#include "vec2d.hpp"
+#include "rive/math/vec2d.hpp"
 #include <cstddef>
 
 namespace rive

diff --git a/include/rive/node.hpp b/include/rive/node.hpp
index a6f9d83..d0f322b 100644
--- a/include/rive/node.hpp
+++ b/include/rive/node.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_NODE_HPP_
 #define _RIVE_NODE_HPP_
-#include "generated/node_base.hpp"
+#include "rive/generated/node_base.hpp"
 
 namespace rive
 {

diff --git a/include/rive/renderer.hpp b/include/rive/renderer.hpp
index d504ae1..1cbcb7a 100644
--- a/include/rive/renderer.hpp
+++ b/include/rive/renderer.hpp

@@ -1,13 +1,13 @@
 #ifndef _RIVE_RENDERER_HPP_
 #define _RIVE_RENDERER_HPP_
 
-#include "command_path.hpp"
-#include "layout.hpp"
-#include "math/aabb.hpp"
-#include "math/mat2d.hpp"
-#include "shapes/paint/blend_mode.hpp"
-#include "shapes/paint/stroke_cap.hpp"
-#include "shapes/paint/stroke_join.hpp"
+#include "rive/command_path.hpp"
+#include "rive/layout.hpp"
+#include "rive/math/aabb.hpp"
+#include "rive/math/mat2d.hpp"
+#include "rive/shapes/paint/blend_mode.hpp"
+#include "rive/shapes/paint/stroke_cap.hpp"
+#include "rive/shapes/paint/stroke_join.hpp"
 #include <cmath>
 #include <stdio.h>
 

diff --git a/include/rive/runtime_header.hpp b/include/rive/runtime_header.hpp
index d298b85..a8fcb07 100644
--- a/include/rive/runtime_header.hpp
+++ b/include/rive/runtime_header.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_RUNTIME_HEADER_HPP_
 #define _RIVE_RUNTIME_HEADER_HPP_
 
-#include "core/binary_reader.hpp"
+#include "rive/core/binary_reader.hpp"
 #include <unordered_map>
 
 namespace rive

diff --git a/include/rive/shapes/clipping_shape.hpp b/include/rive/shapes/clipping_shape.hpp
index 1575ee1..a1e8ec5 100644
--- a/include/rive/shapes/clipping_shape.hpp
+++ b/include/rive/shapes/clipping_shape.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CLIPPING_SHAPE_HPP_
 #define _RIVE_CLIPPING_SHAPE_HPP_
-#include "generated/shapes/clipping_shape_base.hpp"
+#include "rive/generated/shapes/clipping_shape_base.hpp"
 #include <stdio.h>
 #include <vector>
 

diff --git a/include/rive/shapes/cubic_asymmetric_vertex.hpp b/include/rive/shapes/cubic_asymmetric_vertex.hpp
index 342c3ff..456f84f 100644
--- a/include/rive/shapes/cubic_asymmetric_vertex.hpp
+++ b/include/rive/shapes/cubic_asymmetric_vertex.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CUBIC_ASYMMETRIC_VERTEX_HPP_
 #define _RIVE_CUBIC_ASYMMETRIC_VERTEX_HPP_
-#include "generated/shapes/cubic_asymmetric_vertex_base.hpp"
+#include "rive/generated/shapes/cubic_asymmetric_vertex_base.hpp"
 namespace rive
 {
 	class CubicAsymmetricVertex : public CubicAsymmetricVertexBase

diff --git a/include/rive/shapes/cubic_detached_vertex.hpp b/include/rive/shapes/cubic_detached_vertex.hpp
index 3d2bf1b..b220d82 100644
--- a/include/rive/shapes/cubic_detached_vertex.hpp
+++ b/include/rive/shapes/cubic_detached_vertex.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CUBIC_DETACHED_VERTEX_HPP_
 #define _RIVE_CUBIC_DETACHED_VERTEX_HPP_
-#include "generated/shapes/cubic_detached_vertex_base.hpp"
+#include "rive/generated/shapes/cubic_detached_vertex_base.hpp"
 namespace rive
 {
 	class CubicDetachedVertex : public CubicDetachedVertexBase

diff --git a/include/rive/shapes/cubic_mirrored_vertex.hpp b/include/rive/shapes/cubic_mirrored_vertex.hpp
index 5c6bfc4..b548af5 100644
--- a/include/rive/shapes/cubic_mirrored_vertex.hpp
+++ b/include/rive/shapes/cubic_mirrored_vertex.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_CUBIC_MIRRORED_VERTEX_HPP_
 #define _RIVE_CUBIC_MIRRORED_VERTEX_HPP_
-#include "generated/shapes/cubic_mirrored_vertex_base.hpp"
+#include "rive/generated/shapes/cubic_mirrored_vertex_base.hpp"
 namespace rive
 {
 	class CubicMirroredVertex : public CubicMirroredVertexBase

diff --git a/include/rive/shapes/cubic_vertex.hpp b/include/rive/shapes/cubic_vertex.hpp
index cb85440..a11de28 100644
--- a/include/rive/shapes/cubic_vertex.hpp
+++ b/include/rive/shapes/cubic_vertex.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_CUBIC_VERTEX_HPP_
 #define _RIVE_CUBIC_VERTEX_HPP_
-#include "generated/shapes/cubic_vertex_base.hpp"
-#include "math/vec2d.hpp"
+#include "rive/generated/shapes/cubic_vertex_base.hpp"
+#include "rive/math/vec2d.hpp"
 
 namespace rive
 {

diff --git a/include/rive/shapes/ellipse.hpp b/include/rive/shapes/ellipse.hpp
index c9aad4a..64b6b8f 100644
--- a/include/rive/shapes/ellipse.hpp
+++ b/include/rive/shapes/ellipse.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_ELLIPSE_HPP_
 #define _RIVE_ELLIPSE_HPP_
-#include "generated/shapes/ellipse_base.hpp"
-#include "shapes/cubic_detached_vertex.hpp"
+#include "rive/generated/shapes/ellipse_base.hpp"
+#include "rive/shapes/cubic_detached_vertex.hpp"
 
 namespace rive
 {

diff --git a/include/rive/shapes/metrics_path.hpp b/include/rive/shapes/metrics_path.hpp
index 1b3bd04..13a6403 100644
--- a/include/rive/shapes/metrics_path.hpp
+++ b/include/rive/shapes/metrics_path.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_METRICS_PATH_HPP_
 #define _RIVE_METRICS_PATH_HPP_
 
-#include "command_path.hpp"
-#include "math/vec2d.hpp"
+#include "rive/command_path.hpp"
+#include "rive/math/vec2d.hpp"
 #include <cassert>
 #include <vector>
 

diff --git a/include/rive/shapes/paint/fill.hpp b/include/rive/shapes/paint/fill.hpp
index 63e5ed2..22fedae 100644
--- a/include/rive/shapes/paint/fill.hpp
+++ b/include/rive/shapes/paint/fill.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_FILL_HPP_
 #define _RIVE_FILL_HPP_
-#include "generated/shapes/paint/fill_base.hpp"
-#include "shapes/path_space.hpp"
+#include "rive/generated/shapes/paint/fill_base.hpp"
+#include "rive/shapes/path_space.hpp"
 namespace rive
 {
 	class Fill : public FillBase

diff --git a/include/rive/shapes/paint/gradient_stop.hpp b/include/rive/shapes/paint/gradient_stop.hpp
index c1d0130..4d0256f 100644
--- a/include/rive/shapes/paint/gradient_stop.hpp
+++ b/include/rive/shapes/paint/gradient_stop.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_GRADIENT_STOP_HPP_
 #define _RIVE_GRADIENT_STOP_HPP_
-#include "generated/shapes/paint/gradient_stop_base.hpp"
+#include "rive/generated/shapes/paint/gradient_stop_base.hpp"
 namespace rive
 {
 	class GradientStop : public GradientStopBase

diff --git a/include/rive/shapes/paint/linear_gradient.hpp b/include/rive/shapes/paint/linear_gradient.hpp
index c85a891..f201747 100644
--- a/include/rive/shapes/paint/linear_gradient.hpp
+++ b/include/rive/shapes/paint/linear_gradient.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_LINEAR_GRADIENT_HPP_
 #define _RIVE_LINEAR_GRADIENT_HPP_
-#include "generated/shapes/paint/linear_gradient_base.hpp"
-#include "math/vec2d.hpp"
-#include "shapes/paint/shape_paint_mutator.hpp"
+#include "rive/generated/shapes/paint/linear_gradient_base.hpp"
+#include "rive/math/vec2d.hpp"
+#include "rive/shapes/paint/shape_paint_mutator.hpp"
 #include <vector>
 namespace rive
 {

diff --git a/include/rive/shapes/paint/radial_gradient.hpp b/include/rive/shapes/paint/radial_gradient.hpp
index a121344..547b960 100644
--- a/include/rive/shapes/paint/radial_gradient.hpp
+++ b/include/rive/shapes/paint/radial_gradient.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_RADIAL_GRADIENT_HPP_
 #define _RIVE_RADIAL_GRADIENT_HPP_
-#include "generated/shapes/paint/radial_gradient_base.hpp"
+#include "rive/generated/shapes/paint/radial_gradient_base.hpp"
 namespace rive
 {
 	class RadialGradient : public RadialGradientBase

diff --git a/include/rive/shapes/paint/shape_paint.hpp b/include/rive/shapes/paint/shape_paint.hpp
index c0a67c7..9453ce1 100644
--- a/include/rive/shapes/paint/shape_paint.hpp
+++ b/include/rive/shapes/paint/shape_paint.hpp

@@ -1,10 +1,10 @@
 #ifndef _RIVE_SHAPE_PAINT_HPP_
 #define _RIVE_SHAPE_PAINT_HPP_
-#include "generated/shapes/paint/shape_paint_base.hpp"
-#include "renderer.hpp"
-#include "shapes/paint/blend_mode.hpp"
-#include "shapes/paint/shape_paint_mutator.hpp"
-#include "shapes/path_space.hpp"
+#include "rive/generated/shapes/paint/shape_paint_base.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/paint/blend_mode.hpp"
+#include "rive/shapes/paint/shape_paint_mutator.hpp"
+#include "rive/shapes/path_space.hpp"
 namespace rive
 {
 	class RenderPaint;

diff --git a/include/rive/shapes/paint/solid_color.hpp b/include/rive/shapes/paint/solid_color.hpp
index 3c489e8..96ab882 100644
--- a/include/rive/shapes/paint/solid_color.hpp
+++ b/include/rive/shapes/paint/solid_color.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_SOLID_COLOR_HPP_
 #define _RIVE_SOLID_COLOR_HPP_
-#include "generated/shapes/paint/solid_color_base.hpp"
-#include "shapes/paint/shape_paint_mutator.hpp"
+#include "rive/generated/shapes/paint/solid_color_base.hpp"
+#include "rive/shapes/paint/shape_paint_mutator.hpp"
 namespace rive
 {
 	class SolidColor : public SolidColorBase, public ShapePaintMutator

diff --git a/include/rive/shapes/paint/stroke.hpp b/include/rive/shapes/paint/stroke.hpp
index 7bc88d4..3cceb2f 100644
--- a/include/rive/shapes/paint/stroke.hpp
+++ b/include/rive/shapes/paint/stroke.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_STROKE_HPP_
 #define _RIVE_STROKE_HPP_
-#include "generated/shapes/paint/stroke_base.hpp"
-#include "shapes/path_space.hpp"
+#include "rive/generated/shapes/paint/stroke_base.hpp"
+#include "rive/shapes/path_space.hpp"
 namespace rive
 {
 	class StrokeEffect;

diff --git a/include/rive/shapes/paint/trim_path.hpp b/include/rive/shapes/paint/trim_path.hpp
index 36217f6..a7047e4 100644
--- a/include/rive/shapes/paint/trim_path.hpp
+++ b/include/rive/shapes/paint/trim_path.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRIM_PATH_HPP_
 #define _RIVE_TRIM_PATH_HPP_
-#include "generated/shapes/paint/trim_path_base.hpp"
-#include "shapes/paint/stroke_effect.hpp"
+#include "rive/generated/shapes/paint/trim_path_base.hpp"
+#include "rive/shapes/paint/stroke_effect.hpp"
 #include <stdio.h>
 
 namespace rive

diff --git a/include/rive/shapes/parametric_path.hpp b/include/rive/shapes/parametric_path.hpp
index 728fc99..b72098f 100644
--- a/include/rive/shapes/parametric_path.hpp
+++ b/include/rive/shapes/parametric_path.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_PARAMETRIC_PATH_HPP_
 #define _RIVE_PARAMETRIC_PATH_HPP_
-#include "generated/shapes/parametric_path_base.hpp"
+#include "rive/generated/shapes/parametric_path_base.hpp"
 namespace rive
 {
 	class ParametricPath : public ParametricPathBase

diff --git a/include/rive/shapes/path.hpp b/include/rive/shapes/path.hpp
index a4b3567..074b3be 100644
--- a/include/rive/shapes/path.hpp
+++ b/include/rive/shapes/path.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_PATH_HPP_
 #define _RIVE_PATH_HPP_
-#include "generated/shapes/path_base.hpp"
-#include "math/mat2d.hpp"
+#include "rive/generated/shapes/path_base.hpp"
+#include "rive/math/mat2d.hpp"
 #include <vector>
 
 namespace rive

diff --git a/include/rive/shapes/path_composer.hpp b/include/rive/shapes/path_composer.hpp
index 385ba41..e412878 100644
--- a/include/rive/shapes/path_composer.hpp
+++ b/include/rive/shapes/path_composer.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_PATH_COMPOSER_HPP_
 #define _RIVE_PATH_COMPOSER_HPP_
-#include "component.hpp"
+#include "rive/component.hpp"
 namespace rive
 {
 	class Shape;

diff --git a/include/rive/shapes/path_vertex.hpp b/include/rive/shapes/path_vertex.hpp
index a1b5d97..d4ce1f8 100644
--- a/include/rive/shapes/path_vertex.hpp
+++ b/include/rive/shapes/path_vertex.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_PATH_VERTEX_HPP_
 #define _RIVE_PATH_VERTEX_HPP_
-#include "bones/weight.hpp"
-#include "generated/shapes/path_vertex_base.hpp"
-#include "math/mat2d.hpp"
+#include "rive/bones/weight.hpp"
+#include "rive/generated/shapes/path_vertex_base.hpp"
+#include "rive/math/mat2d.hpp"
 namespace rive
 {
 	class PathVertex : public PathVertexBase

diff --git a/include/rive/shapes/points_path.hpp b/include/rive/shapes/points_path.hpp
index 70cdd2c..6763608 100644
--- a/include/rive/shapes/points_path.hpp
+++ b/include/rive/shapes/points_path.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_POINTS_PATH_HPP_
 #define _RIVE_POINTS_PATH_HPP_
-#include "bones/skinnable.hpp"
-#include "generated/shapes/points_path_base.hpp"
+#include "rive/bones/skinnable.hpp"
+#include "rive/generated/shapes/points_path_base.hpp"
 namespace rive
 {
 	class PointsPath : public PointsPathBase, public Skinnable

diff --git a/include/rive/shapes/polygon.hpp b/include/rive/shapes/polygon.hpp
index ef3724d..a0e05a0 100644
--- a/include/rive/shapes/polygon.hpp
+++ b/include/rive/shapes/polygon.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_POLYGON_HPP_
 #define _RIVE_POLYGON_HPP_
-#include "generated/shapes/polygon_base.hpp"
-#include "shapes/path_vertex.hpp"
-#include "shapes/straight_vertex.hpp"
+#include "rive/generated/shapes/polygon_base.hpp"
+#include "rive/shapes/path_vertex.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 #include <vector>
 namespace rive
 {

diff --git a/include/rive/shapes/rectangle.hpp b/include/rive/shapes/rectangle.hpp
index 5b071f6..df633c5 100644
--- a/include/rive/shapes/rectangle.hpp
+++ b/include/rive/shapes/rectangle.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_RECTANGLE_HPP_
 #define _RIVE_RECTANGLE_HPP_
-#include "generated/shapes/rectangle_base.hpp"
-#include "shapes/straight_vertex.hpp"
+#include "rive/generated/shapes/rectangle_base.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 
 namespace rive
 {

diff --git a/include/rive/shapes/shape.hpp b/include/rive/shapes/shape.hpp
index b3c03a9..30ca2d9 100644
--- a/include/rive/shapes/shape.hpp
+++ b/include/rive/shapes/shape.hpp

@@ -1,8 +1,8 @@
 #ifndef _RIVE_SHAPE_HPP_
 #define _RIVE_SHAPE_HPP_
-#include "generated/shapes/shape_base.hpp"
-#include "shapes/path_composer.hpp"
-#include "shapes/shape_paint_container.hpp"
+#include "rive/generated/shapes/shape_base.hpp"
+#include "rive/shapes/path_composer.hpp"
+#include "rive/shapes/shape_paint_container.hpp"
 #include <vector>
 
 namespace rive

diff --git a/include/rive/shapes/shape_paint_container.hpp b/include/rive/shapes/shape_paint_container.hpp
index 60a1e76..f406d2f 100644
--- a/include/rive/shapes/shape_paint_container.hpp
+++ b/include/rive/shapes/shape_paint_container.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_SHAPE_PAINT_CONTAINER_HPP_
 #define _RIVE_SHAPE_PAINT_CONTAINER_HPP_
-#include "shapes/paint/blend_mode.hpp"
-#include "shapes/path_space.hpp"
+#include "rive/shapes/paint/blend_mode.hpp"
+#include "rive/shapes/path_space.hpp"
 #include <vector>
 
 namespace rive

diff --git a/include/rive/shapes/star.hpp b/include/rive/shapes/star.hpp
index 6743b4a..2651a0f 100644
--- a/include/rive/shapes/star.hpp
+++ b/include/rive/shapes/star.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STAR_HPP_
 #define _RIVE_STAR_HPP_
-#include "generated/shapes/star_base.hpp"
+#include "rive/generated/shapes/star_base.hpp"
 #include <stdio.h>
 namespace rive
 {

diff --git a/include/rive/shapes/straight_vertex.hpp b/include/rive/shapes/straight_vertex.hpp
index 93955f4..a5b286b 100644
--- a/include/rive/shapes/straight_vertex.hpp
+++ b/include/rive/shapes/straight_vertex.hpp

@@ -1,6 +1,6 @@
 #ifndef _RIVE_STRAIGHT_VERTEX_HPP_
 #define _RIVE_STRAIGHT_VERTEX_HPP_
-#include "generated/shapes/straight_vertex_base.hpp"
+#include "rive/generated/shapes/straight_vertex_base.hpp"
 namespace rive
 {
 	class StraightVertex : public StraightVertexBase

diff --git a/include/rive/shapes/triangle.hpp b/include/rive/shapes/triangle.hpp
index 2fb8154..a219932 100644
--- a/include/rive/shapes/triangle.hpp
+++ b/include/rive/shapes/triangle.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRIANGLE_HPP_
 #define _RIVE_TRIANGLE_HPP_
-#include "generated/shapes/triangle_base.hpp"
-#include "shapes/straight_vertex.hpp"
+#include "rive/generated/shapes/triangle_base.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 
 namespace rive
 {

diff --git a/include/rive/transform_component.hpp b/include/rive/transform_component.hpp
index 7065a85..80dcf57 100644
--- a/include/rive/transform_component.hpp
+++ b/include/rive/transform_component.hpp

@@ -1,7 +1,7 @@
 #ifndef _RIVE_TRANSFORM_COMPONENT_HPP_
 #define _RIVE_TRANSFORM_COMPONENT_HPP_
-#include "generated/transform_component_base.hpp"
-#include "math/mat2d.hpp"
+#include "rive/generated/transform_component_base.hpp"
+#include "rive/math/mat2d.hpp"
 
 namespace rive
 {