diff --git a/src/BitTorrentTracker.cc b/src/BitTorrentTracker.cc
index 50f6d0449c..aaf925f196 100644
--- a/src/BitTorrentTracker.cc
+++ b/src/BitTorrentTracker.cc
@@ -8,8 +8,8 @@
 #include <sys/types.h>
 #include <regex.h>
 
-# define FMT_INT "%lld"
-# define FMT_UINT "%llu"
+# define FMT_INT "%" PRId64
+# define FMT_UINT "%" PRIu64
 
 static TableType* bt_tracker_headers = 0;
 static RecordType* bittorrent_peer;
diff --git a/src/Desc.cc b/src/Desc.cc
index 15db73d7c7..ce6083800c 100644
--- a/src/Desc.cc
+++ b/src/Desc.cc
@@ -127,7 +127,7 @@ void ODesc::Add(int64 i)
 	else
 		{
 		char tmp[256];
-		sprintf(tmp, "%lld", i);
+		sprintf(tmp, "%" PRId64, i);
 		Add(tmp);
 		}
 	}
@@ -139,7 +139,7 @@ void ODesc::Add(uint64 u)
 	else
 		{
 		char tmp[256];
-		sprintf(tmp, "%llu", u);
+		sprintf(tmp, "%" PRIu64, u);
 		Add(tmp);
 		}
 	}
diff --git a/src/HTTP.cc b/src/HTTP.cc
index 6d1c8bdfc7..0c7e8e70e6 100644
--- a/src/HTTP.cc
+++ b/src/HTTP.cc
@@ -230,7 +230,7 @@ int HTTP_Entity::Undelivered(int64_t len)
 	{
 	if ( DEBUG_http )
 		{
-		DEBUG_MSG("Content gap %d, expect_data_length %d\n",
+		DEBUG_MSG("Content gap %" PRId64", expect_data_length %" PRId64 "\n",
 			  len, expect_data_length);
 		}