diff --git a/demos/gtk-demo/constraints.c b/demos/gtk-demo/constraints.c
index cc6cac145e..d08bfcfe7e 100644
--- a/demos/gtk-demo/constraints.c
+++ b/demos/gtk-demo/constraints.c
@@ -78,31 +78,31 @@ build_constraints (SimpleGrid          *self,
     gtk_constraint_new (NULL,
                         GTK_CONSTRAINT_ATTRIBUTE_START,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button1,
+                        GTK_CONSTRAINT_TARGET (self->button1),
                         GTK_CONSTRAINT_ATTRIBUTE_START,
                         1.0,
                         -8.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button1,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button1),
                         GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
+                        GTK_CONSTRAINT_TARGET (self->button2),
                         GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
                         1.0,
                         0.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button1,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button1),
                         GTK_CONSTRAINT_ATTRIBUTE_END,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
+                        GTK_CONSTRAINT_TARGET (self->button2),
                         GTK_CONSTRAINT_ATTRIBUTE_START,
                         1.0,
                         -12.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button2,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button2),
                         GTK_CONSTRAINT_ATTRIBUTE_END,
                         GTK_CONSTRAINT_RELATION_EQ,
                         NULL,
@@ -114,13 +114,13 @@ build_constraints (SimpleGrid          *self,
     gtk_constraint_new (NULL,
                         GTK_CONSTRAINT_ATTRIBUTE_START,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button3,
+                        GTK_CONSTRAINT_TARGET (self->button3),
                         GTK_CONSTRAINT_ATTRIBUTE_START,
                         1.0,
                         -8.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button3),
                         GTK_CONSTRAINT_ATTRIBUTE_END,
                         GTK_CONSTRAINT_RELATION_EQ,
                         NULL,
@@ -132,7 +132,7 @@ build_constraints (SimpleGrid          *self,
     gtk_constraint_new (NULL,
                         GTK_CONSTRAINT_ATTRIBUTE_TOP,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button1,
+                        GTK_CONSTRAINT_TARGET (self->button1),
                         GTK_CONSTRAINT_ATTRIBUTE_TOP,
                         1.0,
                         -8.0,
@@ -141,49 +141,49 @@ build_constraints (SimpleGrid          *self,
     gtk_constraint_new (NULL,
                         GTK_CONSTRAINT_ATTRIBUTE_TOP,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
+                        GTK_CONSTRAINT_TARGET (self->button2),
                         GTK_CONSTRAINT_ATTRIBUTE_TOP,
                         1.0,
                         -8.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button1,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button1),
                         GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button3,
+                        GTK_CONSTRAINT_TARGET (self->button3),
                         GTK_CONSTRAINT_ATTRIBUTE_TOP,
                         1.0,
                         -12.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button2,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button2),
                         GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button3,
+                        GTK_CONSTRAINT_TARGET (self->button3),
                         GTK_CONSTRAINT_ATTRIBUTE_TOP,
                         1.0,
                         -12.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button3),
                         GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button1,
+                        GTK_CONSTRAINT_TARGET (self->button1),
                         GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
                         1.0,
                         0.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button3),
                         GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
                         GTK_CONSTRAINT_RELATION_EQ,
-                        self->button2,
+                        GTK_CONSTRAINT_TARGET (self->button2),
                         GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
                         1.0,
                         0.0,
                         GTK_CONSTRAINT_STRENGTH_REQUIRED));
   gtk_constraint_layout_add_constraint (manager,
-    gtk_constraint_new (self->button3,
+    gtk_constraint_new (GTK_CONSTRAINT_TARGET (self->button3),
                         GTK_CONSTRAINT_ATTRIBUTE_BOTTOM,
                         GTK_CONSTRAINT_RELATION_EQ,
                         NULL,