diff --git a/bindings/c/fdb_c.cpp b/bindings/c/fdb_c.cpp
index fe4704039d..cb63feea70 100644
--- a/bindings/c/fdb_c.cpp
+++ b/bindings/c/fdb_c.cpp
@@ -19,6 +19,7 @@
  */
 
 #define FDB_API_VERSION 610
+#define FDB_INCLUDE_LEGACY_TYPES
 
 #include "fdbclient/MultiVersionTransaction.h"
 #include "foundationdb/fdb_c.h"
diff --git a/bindings/c/foundationdb/fdb_c.h b/bindings/c/foundationdb/fdb_c.h
index d96ecdad44..5c15eb6634 100644
--- a/bindings/c/foundationdb/fdb_c.h
+++ b/bindings/c/foundationdb/fdb_c.h
@@ -253,9 +253,16 @@ extern "C" {
 
     /* LEGACY API VERSIONS */
 
-#if FDB_API_VERSION < 610
+#if FDB_API_VERSION < 610 || defined FDB_INCLUDE_LEGACY_TYPES
     typedef struct FDB_cluster FDBCluster;
 
+    typedef enum {
+        // This option is only a placeholder for C compatibility and should not be used
+        FDB_CLUSTER_OPTION_DUMMY_DO_NOT_USE=-1
+    } FDBClusterOption;
+#endif
+
+#if FDB_API_VERSION < 610
     DLLEXPORT WARN_UNUSED_RESULT fdb_error_t
     fdb_future_get_cluster( FDBFuture* f, FDBCluster** out_cluster );
 
@@ -266,11 +273,6 @@ extern "C" {
 
     DLLEXPORT void fdb_cluster_destroy( FDBCluster* c );
 
-    typedef enum {
-        // This option is only a placeholder for C compatibility and should not be used
-        FDB_CLUSTER_OPTION_DUMMY_DO_NOT_USE=-1
-    } FDBClusterOption;
-
     DLLEXPORT WARN_UNUSED_RESULT fdb_error_t
     fdb_cluster_set_option( FDBCluster* c, FDBClusterOption option,
                             uint8_t const* value, int value_length );
diff --git a/bindings/c/test/test.h b/bindings/c/test/test.h
index 415cc23ccc..03051f30d6 100644
--- a/bindings/c/test/test.h
+++ b/bindings/c/test/test.h
@@ -236,22 +236,8 @@ FDBDatabase* openDatabase(struct ResultSet *rs, pthread_t *netThread) {
 	checkError(fdb_setup_network(), "setup network", rs);
 	pthread_create(netThread, NULL, &runNetwork, NULL);
 
-	FDBFuture *f = fdb_create_cluster(NULL);
-	checkError(fdb_future_block_until_ready(f), "block for cluster", rs);
-
-	FDBCluster *cluster;
-	checkError(fdb_future_get_cluster(f, &cluster), "get cluster", rs);
-
-	fdb_future_destroy(f);
-
-	f = fdb_cluster_create_database(cluster, (uint8_t*)"DB", 2);
-	checkError(fdb_future_block_until_ready(f), "block for database", rs);
-
 	FDBDatabase *db;
-	checkError(fdb_future_get_database(f, &db), "get database", rs);
-
-	fdb_future_destroy(f);
-	fdb_cluster_destroy(cluster);
+	checkError(fdb_create_database(NULL, &db), "create database", rs);
 
 	return db;
 }
diff --git a/bindings/java/src/main/com/apple/foundationdb/Cluster.java b/bindings/java/src/main/com/apple/foundationdb/Cluster.java
index fbbcca6d4a..58e4b5f269 100644
--- a/bindings/java/src/main/com/apple/foundationdb/Cluster.java
+++ b/bindings/java/src/main/com/apple/foundationdb/Cluster.java
@@ -26,7 +26,7 @@ import java.util.concurrent.Executor;
  * The {@code Cluster} represents a connection to a physical set of cooperating machines
  *  running FoundationDB. A {@code Cluster} is opened with a reference to a cluster file.
  *
- * This class is deprecated. Use {@link #FDB.open} to open a {@link #Database} directly<br>
+ * This class is deprecated. Use {@link FDB#open} to open a {@link Database} directly<br>
  * <br>
  * <b>Note:</b> {@code Cluster} objects must be {@link #close closed} when no longer in use
  *  in order to free any associated resources.