diff --git a/sync-server/src/api/add_version.rs b/sync-server/src/api/add_version.rs
index 40cb5fdd0..83f010ef5 100644
--- a/sync-server/src/api/add_version.rs
+++ b/sync-server/src/api/add_version.rs
@@ -1,7 +1,7 @@
 use crate::api::{
     ServerState, HISTORY_SEGMENT_CONTENT_TYPE, PARENT_VERSION_ID_HEADER, VERSION_ID_HEADER,
 };
-use crate::types::{AddVersionResult, ClientId, VersionId};
+use crate::server::{AddVersionResult, ClientId, VersionId};
 use actix_web::{
     error, http::StatusCode, post, web, HttpMessage, HttpRequest, HttpResponse, Result,
 };
diff --git a/sync-server/src/api/get_child_version.rs b/sync-server/src/api/get_child_version.rs
index 0667ec034..4056408ce 100644
--- a/sync-server/src/api/get_child_version.rs
+++ b/sync-server/src/api/get_child_version.rs
@@ -1,7 +1,7 @@
 use crate::api::{
     ServerState, HISTORY_SEGMENT_CONTENT_TYPE, PARENT_VERSION_ID_HEADER, VERSION_ID_HEADER,
 };
-use crate::types::{ClientId, VersionId};
+use crate::server::{ClientId, VersionId};
 use actix_web::{error, get, http::StatusCode, web, HttpResponse, Result};
 
 /// Get a child version.
diff --git a/sync-server/src/main.rs b/sync-server/src/main.rs
index 7caa360f8..880ce7b27 100644
--- a/sync-server/src/main.rs
+++ b/sync-server/src/main.rs
@@ -4,7 +4,6 @@ use server::{NullSyncServer, SyncServer};
 
 mod api;
 mod server;
-mod types;
 
 // TODO: use hawk to sign requests
 
diff --git a/sync-server/src/server/mod.rs b/sync-server/src/server/mod.rs
index 71961468b..5bda024f0 100644
--- a/sync-server/src/server/mod.rs
+++ b/sync-server/src/server/mod.rs
@@ -1,7 +1,24 @@
-use crate::types::{AddVersionResult, ClientId, GetVersionResult, HistorySegment, VersionId};
 use failure::Fallible;
 use taskchampion::Uuid;
 
+pub(crate) type HistorySegment = Vec<u8>;
+pub(crate) type ClientId = Uuid;
+pub(crate) type VersionId = Uuid;
+
+/// Response to get_child_version
+pub(crate) struct GetVersionResult {
+    pub(crate) version_id: Uuid,
+    pub(crate) parent_version_id: Uuid,
+    pub(crate) history_segment: HistorySegment,
+}
+
+/// Response to add_version
+pub(crate) enum AddVersionResult {
+    /// OK, version added with the given ID
+    Ok(VersionId),
+    /// Rejected; expected a version with the given parent version
+    ExpectedParentVersion(VersionId),
+}
 pub(crate) trait SyncServer: Sync + Send {
     fn get_child_version(
         &self,
diff --git a/sync-server/src/types.rs b/sync-server/src/types.rs
deleted file mode 100644
index 69dbe2fbc..000000000
--- a/sync-server/src/types.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use taskchampion::Uuid;
-
-pub(crate) type HistorySegment = Vec<u8>;
-pub(crate) type ClientId = Uuid;
-pub(crate) type VersionId = Uuid;
-
-/// Response to get_child_version
-pub(crate) struct GetVersionResult {
-    pub(crate) version_id: Uuid,
-    pub(crate) parent_version_id: Uuid,
-    pub(crate) history_segment: HistorySegment,
-}
-
-/// Response to add_version
-pub(crate) enum AddVersionResult {
-    /// OK, version added with the given ID
-    Ok(VersionId),
-    /// Rejected; expected a version with the given parent version
-    ExpectedParentVersion(VersionId),
-}