diff --git a/source/dub/dependency.d b/source/dub/dependency.d
index da1b552..e1e40b0 100644
--- a/source/dub/dependency.d
+++ b/source/dub/dependency.d
@@ -378,7 +378,7 @@
 	}
 
 	/// ditto
-	hash_t toHash()
+	size_t toHash()
 	const nothrow @trusted  {
 		try {
 			size_t hash = 0;
diff --git a/source/dub/dependencyresolver.d b/source/dub/dependencyresolver.d
index 3b61758..85e97de 100644
--- a/source/dub/dependencyresolver.d
+++ b/source/dub/dependencyresolver.d
@@ -40,7 +40,7 @@
 		CONFIGS configs;
 		DependencyType depType = DependencyType.required;
 
-		hash_t toHash() const nothrow @trusted {
+		size_t toHash() const nothrow @trusted {
 			size_t ret = typeid(string).getHash(&pack);
 			ret ^= typeid(CONFIGS).getHash(&configs);
 			return ret;
@@ -61,7 +61,7 @@
 		string pack;
 		CONFIG config;
 
-		hash_t toHash() const nothrow @trusted {
+		size_t toHash() const nothrow @trusted {
 			size_t ret = pack.hashOf();
 			ret ^= typeid(CONFIG).getHash(&config);
 			return ret;
diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d
index df65729..aa8bc59 100644
--- a/source/dub/generators/visuald.d
+++ b/source/dub/generators/visuald.d
@@ -455,7 +455,7 @@
 		NativePath filePath;
 		bool build;
 
-		hash_t toHash() const nothrow @trusted { return structurePath.toHash() ^ filePath.toHash() ^ (build * 0x1f3e7b2c); }
+		size_t toHash() const nothrow @trusted { return structurePath.toHash() ^ filePath.toHash() ^ (build * 0x1f3e7b2c); }
 		int opCmp(ref const SourceFile rhs) const { return sortOrder(this, rhs); }
 		// "a < b" for folder structures (deepest folder first, else lexical)
 		private final static int sortOrder(ref const SourceFile a, ref const SourceFile b) {
diff --git a/source/dub/internal/vibecompat/inet/path.d b/source/dub/internal/vibecompat/inet/path.d
index 047ac5d..4ad987e 100644
--- a/source/dub/internal/vibecompat/inet/path.d
+++ b/source/dub/internal/vibecompat/inet/path.d
@@ -266,9 +266,9 @@
 		return 0;
 	}
 
-	hash_t toHash()
+	size_t toHash()
 	const nothrow @trusted {
-		hash_t ret;
+		size_t ret;
 		auto strhash = &typeid(string).getHash;
 		try foreach (n; nodes) ret ^= strhash(&n.m_name);
 		catch (Exception) assert(false);
diff --git a/source/dub/internal/vibecompat/inet/url.d b/source/dub/internal/vibecompat/inet/url.d
index 720d5d0..eb302e5 100644
--- a/source/dub/internal/vibecompat/inet/url.d
+++ b/source/dub/internal/vibecompat/inet/url.d
@@ -80,7 +80,7 @@
 			auto si = str.countUntil('/');
 			if( si < 0 ) si = str.length;
 			auto ai = str[0 .. si].countUntil('@');
-			sizediff_t hs = 0;
+			ptrdiff_t hs = 0;
 			if( ai >= 0 ){
 				hs = ai+1;
 				auto ci = str[0 .. ai].countUntil(':');
diff --git a/source/dub/semver.d b/source/dub/semver.d
index dd68102..a99749c 100644
--- a/source/dub/semver.d
+++ b/source/dub/semver.d
@@ -375,9 +375,9 @@
 	return true;
 }
 
-private sizediff_t indexOfAny(string str, in char[] chars)
+private ptrdiff_t indexOfAny(string str, in char[] chars)
 pure @nogc {
-	sizediff_t ret = -1;
+	ptrdiff_t ret = -1;
 	foreach (ch; chars) {
 		auto idx = str.indexOf(ch);
 		if (idx >= 0 && (ret < 0 || idx < ret))