diff --git a/pkg/vere/benchmarks.c b/pkg/vere/benchmarks.c
index a9215cf864..9898217c5e 100644
--- a/pkg/vere/benchmarks.c
+++ b/pkg/vere/benchmarks.c
@@ -2,7 +2,7 @@
 
 #include "noun.h"
 #include "jets/q.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "vere.h"
 
 /* _setup(): prepare for tests.
diff --git a/pkg/vere/boot_tests.c b/pkg/vere/boot_tests.c
index 3276834d69..d9728d88cf 100644
--- a/pkg/vere/boot_tests.c
+++ b/pkg/vere/boot_tests.c
@@ -2,7 +2,7 @@
 
 #include "ivory.h"
 #include "noun.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "vere.h"
 
 /* _setup(): prepare for tests.
diff --git a/pkg/vere/db/lmdb.c b/pkg/vere/db/lmdb.c
index a31bbd1de6..61158e3d54 100644
--- a/pkg/vere/db/lmdb.c
+++ b/pkg/vere/db/lmdb.c
@@ -4,7 +4,7 @@
 
 #include <sys/stat.h>
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "noun.h"
 
 /* mdb_logerror(): writes an error message and lmdb error code to f.
diff --git a/pkg/vere/db/lmdb.h b/pkg/vere/db/lmdb.h
index 43c6b433ff..e630cf4dd2 100644
--- a/pkg/vere/db/lmdb.h
+++ b/pkg/vere/db/lmdb.h
@@ -3,7 +3,7 @@
 #ifndef U3_VERE_DB_LMDB_H
 #define U3_VERE_DB_LMDB_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "lmdb/lmdb.h"
 
   /* lmdb api wrapper
diff --git a/pkg/vere/io/ames.c b/pkg/vere/io/ames.c
index 165b57fd18..6d22d2eca1 100644
--- a/pkg/vere/io/ames.c
+++ b/pkg/vere/io/ames.c
@@ -5,12 +5,12 @@
 #include "io/ames/stun.h"
 
 #include "noun.h"
-#include "ur.h"
+#include "ur/ur.h"
 
 #include "zlib.h"
 #include "natpmp.h"
 
-#include <ent.h>
+#include "ent/ent.h"
 
 #include <arpa/inet.h>
 
diff --git a/pkg/vere/king.c b/pkg/vere/king.c
index 0cf555a3d1..8d5402cb30 100644
--- a/pkg/vere/king.c
+++ b/pkg/vere/king.c
@@ -8,7 +8,7 @@
 #include "ivory.h"
 #include "noun.h"
 #include "pace.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "uv.h"
 #include "version.h"
 
diff --git a/pkg/vere/lord.c b/pkg/vere/lord.c
index ded3bc824d..b7c03dfe6f 100644
--- a/pkg/vere/lord.c
+++ b/pkg/vere/lord.c
@@ -3,7 +3,7 @@
 #include "vere.h"
 
 #include "noun.h"
-#include "ur.h"
+#include "ur/ur.h"
 
 #undef LORD_TRACE_JAM
 #undef LORD_TRACE_CUE
diff --git a/pkg/vere/main.c b/pkg/vere/main.c
index f78031c70e..1b09ccce3f 100644
--- a/pkg/vere/main.c
+++ b/pkg/vere/main.c
@@ -5,7 +5,7 @@
 #include "noun.h"
 #include "events.h" // XX remove, see full replay in _cw_play()
 #include "ivory.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "platform/rsignal.h"
 #include "vere.h"
 #include "sigsegv.h"
diff --git a/pkg/vere/mars.c b/pkg/vere/mars.c
index db9056a0ab..6d4af05420 100644
--- a/pkg/vere/mars.c
+++ b/pkg/vere/mars.c
@@ -2,12 +2,12 @@
 **
 **  the main loop of a mars process.
 */
-#include "c3.h"
+#include "c3/c3.h"
 #include "noun.h"
 #include "types.h"
 #include "vere.h"
 #include "ivory.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "db/lmdb.h"
 #include <mars.h>
 #include <stdio.h>
diff --git a/pkg/vere/noun_tests.c b/pkg/vere/noun_tests.c
index 037cd04c14..f26444fc01 100644
--- a/pkg/vere/noun_tests.c
+++ b/pkg/vere/noun_tests.c
@@ -2,7 +2,7 @@
 
 #include "noun.h"
 #include "ivory.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "vere.h"
 
 #define TRUE 1
diff --git a/pkg/vere/pier.c b/pkg/vere/pier.c
index 23d96bd377..1e8c25b110 100644
--- a/pkg/vere/pier.c
+++ b/pkg/vere/pier.c
@@ -1,7 +1,7 @@
 /// @file
 
 #include "db/lmdb.h"
-#include "ent.h"
+#include "ent/ent.h"
 #include "noun.h"
 #include "pace.h"
 #include "vere.h"
diff --git a/pkg/vere/platform/darwin/ptty.c b/pkg/vere/platform/darwin/ptty.c
index 3f66ee18f8..a1ec334507 100644
--- a/pkg/vere/platform/darwin/ptty.c
+++ b/pkg/vere/platform/darwin/ptty.c
@@ -1,6 +1,6 @@
 /// @file
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "noun.h"
 #include "vere.h"
 #include <sys/ioctl.h>
diff --git a/pkg/vere/platform/linux/ptty.c b/pkg/vere/platform/linux/ptty.c
index 3f66ee18f8..a1ec334507 100644
--- a/pkg/vere/platform/linux/ptty.c
+++ b/pkg/vere/platform/linux/ptty.c
@@ -1,6 +1,6 @@
 /// @file
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "noun.h"
 #include "vere.h"
 #include <sys/ioctl.h>
diff --git a/pkg/vere/serf.c b/pkg/vere/serf.c
index cec8bece55..78ca9708c2 100644
--- a/pkg/vere/serf.c
+++ b/pkg/vere/serf.c
@@ -4,7 +4,7 @@
 
 #include "vere.h"
 #include "ivory.h"
-#include "ur.h"
+#include "ur/ur.h"
 
 /*
 |%
diff --git a/pkg/vere/vere.h b/pkg/vere/vere.h
index dab95c5080..71fd37fe89 100644
--- a/pkg/vere/vere.h
+++ b/pkg/vere/vere.h
@@ -3,7 +3,7 @@
 #ifndef U3_VERE_H
 #define U3_VERE_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "db/lmdb.h"
 #include "noun.h"
 #include "serf.h"