diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 8ecff8b3..2d7d08d9 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,13 +1,15 @@
 # 3 june 2016
 
 list(APPEND _LIBUI_SOURCES
+	common/attribute.c
 	common/attrlist.c
 	common/attrstr.c
 	common/areaevents.c
 	common/control.c
 	common/debug.c
-	common/drawtext.c
+#	common/drawtext.c
 	common/matrix.c
+	common/opentype.c
 	common/shouldquit.c
 	common/userbugs.c
 	common/utf.c
diff --git a/common/attrstr.h b/common/attrstr.h
index 32e632ed..fb96c761 100644
--- a/common/attrstr.h
+++ b/common/attrstr.h
@@ -1,5 +1,11 @@
 // 19 february 2018
 
+// TODO remove when done migrating these functions
+#define uiprivNew(x) uiNew(x)
+#define uiprivAlloc(x, y) uiAlloc(x, y)
+#define uiprivRealloc(x, y) uiRealloc(x, y)
+#define uiprivFree(x) uiFree(x)
+
 // attribute.c
 extern uiAttribute *uiprivAttributeRetain(uiAttribute *a);
 extern void uiprivAttributeRelease(uiAttribute *a);