diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 366683ac8..88173cbda 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -51,8 +51,8 @@ CXXFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CXX@ @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 
 # Object files for system.vpi
-O = sys_table.o sys_bit_vec.o sys_convert.o sys_countdrivers.o sys_darray.o \
-    sys_deposit.o sys_display.o \
+O = sys_table.o sys_convert.o sys_countdrivers.o sys_darray.o sys_deposit.o \
+    sys_display.o \
     sys_fileio.o sys_finish.o sys_icarus.o sys_plusargs.o sys_queue.o \
     sys_random.o sys_random_mti.o sys_readmem.o sys_readmem_lex.o sys_scanf.o \
     sys_sdf.o sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o \
@@ -74,7 +74,7 @@ M = sys_clog2.o v2005_math.o
 # Object files for va_math.vpi
 V = va_math.o
 
-V2009 = v2009_table.o v2009_array.o v2009_enum.o v2009_string.o
+V2009 = v2009_table.o v2009_array.o v2009_bitvec.o v2009_enum.o v2009_string.o
 
 VHDL_SYS = vhdl_table.o sys_priv.o
 
diff --git a/vpi/sys_table.c b/vpi/sys_table.c
index a78754534..23b2c9142 100644
--- a/vpi/sys_table.c
+++ b/vpi/sys_table.c
@@ -23,7 +23,6 @@
 # include <stdlib.h>
 # include <string.h>
 
-extern void sys_bit_vec_register(void);
 extern void sys_convert_register(void);
 extern void sys_countdrivers_register(void);
 extern void sys_darray_register(void);
@@ -197,7 +196,6 @@ static void sys_lxt_or_vcd_register(void)
 }
 
 void (*vlog_startup_routines[])(void) = {
-      sys_bit_vec_register,
       sys_convert_register,
       sys_countdrivers_register,
       sys_darray_register,
diff --git a/vpi/system.sft b/vpi/system.sft
index 93e67cfd2..be082c85f 100644
--- a/vpi/system.sft
+++ b/vpi/system.sft
@@ -17,12 +17,6 @@ $dist_erlang       vpiSysFuncInt
 $clog2             vpiSysFuncInt
 $q_full            vpiSysFuncInt
 
-$countbits  vpiSysFuncInt
-$countones  vpiSysFuncInt
-$onehot     vpiSysFuncSized 1 unsigned
-$onehot0    vpiSysFuncSized 1 unsigned
-$isunknown  vpiSysFuncSized 1 unsigned
-
 $abstime       vpiSysFuncReal
 $simparam      vpiSysFuncReal
 $simparam$str  vpiSysFuncSized 1024 unsigned
diff --git a/vpi/v2009.sft b/vpi/v2009.sft
index e2a84620b..e60c8cfdd 100644
--- a/vpi/v2009.sft
+++ b/vpi/v2009.sft
@@ -12,5 +12,11 @@ $high			vpiSysFuncInt
 $increment		vpiSysFuncInt
 $size			vpiSysFuncInt
 
+$countbits  vpiSysFuncInt
+$countones  vpiSysFuncInt
+$onehot     vpiSysFuncSized 1 unsigned
+$onehot0    vpiSysFuncSized 1 unsigned
+$isunknown  vpiSysFuncSized 1 unsigned
+
 $ivl_array_method$to_vec	vpiSysFuncVoid
 $ivl_array_method$from_vec	vpiSysFuncVoid
diff --git a/vpi/sys_bit_vec.c b/vpi/v2009_bitvec.c
similarity index 100%
rename from vpi/sys_bit_vec.c
rename to vpi/v2009_bitvec.c
diff --git a/vpi/v2009_table.c b/vpi/v2009_table.c
index 4e3328779..a8d613ba2 100644
--- a/vpi/v2009_table.c
+++ b/vpi/v2009_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2010-2018 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,11 +18,13 @@
  */
 
 extern void v2009_array_register(void);
+extern void v2009_bitvec_register(void);
 extern void v2009_enum_register(void);
 extern void v2009_string_register(void);
 
 void (*vlog_startup_routines[])(void) = {
       v2009_array_register,
+      v2009_sys_bitvec_register,
       v2009_enum_register,
       v2009_string_register,
       0