diff --git a/classpath/avian/Code.java b/classpath/avian/Code.java
new file mode 100644
index 0000000000..01b8df7272
--- /dev/null
+++ b/classpath/avian/Code.java
@@ -0,0 +1,5 @@
+package avian;
+
+class Code {
+  // VM-visible fields in types.def
+}
diff --git a/makefile b/makefile
index a14e911f2a..0379753f1b 100755
--- a/makefile
+++ b/makefile
@@ -1354,6 +1354,7 @@ ifneq ($(classpath),avian)
 # them to synthesize a class:
 	classpath-sources := \
 		$(classpath-src)/avian/Addendum.java \
+		$(classpath-src)/avian/Code.java \
 		$(classpath-src)/avian/AnnotationInvocationHandler.java \
 		$(classpath-src)/avian/Assembler.java \
 		$(classpath-src)/avian/Callback.java \
diff --git a/src/types.def b/src/types.def
index 0b6b63f5ab..79e82c8847 100644
--- a/src/types.def
+++ b/src/types.def
@@ -78,7 +78,7 @@
 (type lineNumberTable
   (array uint64_t body))
 
-(type code
+(type code avian/Code
   (object pool)
   (object exceptionHandlerTable)
   (object lineNumberTable)