diff --git a/Cargo.toml b/Cargo.toml
index f1992b6..7506c82 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,8 +28,8 @@ buildtime_bindgen = ["libsqlite3-sys/buildtime_bindgen"]
 limits = []
 hooks = []
 sqlcipher = ["libsqlite3-sys/sqlcipher"]
-vtab = ["libsqlite3-sys/min_sqlite_version_3_7_7"]
-csvtab = ["csv"]
+vtab = ["functions", "libsqlite3-sys/min_sqlite_version_3_7_7"]
+csvtab = ["csv", "vtab"]
 
 [dependencies]
 time = "0.1.0"
diff --git a/src/lib.rs b/src/lib.rs
index 888285a..87623ce 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -125,7 +125,7 @@ pub mod limits;
 mod hooks;
 #[cfg(feature = "hooks")]
 pub use hooks::*;
-#[cfg(all(feature = "vtab", feature = "functions"))]
+#[cfg(feature = "vtab")]
 pub mod vtab;
 
 // Number of cached prepared statements we'll hold on to.