diff --git a/ocaml/xapi-types/OMakefile b/ocaml/xapi-types/OMakefile
index dbcb7c8b1a..36acab4b74 100644
--- a/ocaml/xapi-types/OMakefile
+++ b/ocaml/xapi-types/OMakefile
@@ -1,9 +1,9 @@
-COMMON_OBJS = ref aPI event_types 
+COMMON_OBJS = ref aPI event_types features
 OCAMLINCLUDES += ../idl ../xapi ../idl/ocaml_backend
 OCAMLPACKS += http-svr
 
 OCamlLibrary(xapi-types, $(COMMON_OBJS))
-UseCamlp4(rpclib.syntax, event_types aPI)
+UseCamlp4(rpclib.syntax, event_types aPI features)
 
 .PHONY: clean
 clean:
diff --git a/ocaml/xapi/features.ml b/ocaml/xapi-types/features.ml
similarity index 100%
rename from ocaml/xapi/features.ml
rename to ocaml/xapi-types/features.ml
diff --git a/ocaml/xapi/features.mli b/ocaml/xapi-types/features.mli
similarity index 100%
rename from ocaml/xapi/features.mli
rename to ocaml/xapi-types/features.mli
diff --git a/ocaml/xapi/OMakefile b/ocaml/xapi/OMakefile
index e09823dccd..07b213d82e 100644
--- a/ocaml/xapi/OMakefile
+++ b/ocaml/xapi/OMakefile
@@ -12,7 +12,7 @@ OCAMLINCLUDES = ../idl ../idl/ocaml_backend \
 	../auth ../client_records ../rfb \
 	../xapi-types ../xapi-client
 
-UseCamlp4(rpclib.syntax, features storage_impl xapi_globs locking_helpers xapi_udhcpd storage_migrate \
+UseCamlp4(rpclib.syntax, storage_impl xapi_globs locking_helpers xapi_udhcpd storage_migrate \
           xapi_services system_domains cancel_tests config_file_sync updates \
           sparse_dd_wrapper vhd_tool_wrapper)
 
@@ -285,7 +285,6 @@ XAPI_MODULES = \
 	certificates \
 	bios_strings \
 	xapi_config \
-	features \
 	pool_features \
 	license_init \
 	xapi_pci \