diff --git a/src/backend/distributed/worker/worker_merge_protocol.c b/src/backend/distributed/worker/worker_merge_protocol.c
index 23dce3a0f..38d9cbc45 100644
--- a/src/backend/distributed/worker/worker_merge_protocol.c
+++ b/src/backend/distributed/worker/worker_merge_protocol.c
@@ -17,10 +17,6 @@
 #include "funcapi.h"
 #include "miscadmin.h"
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 #include "access/htup_details.h"
 #include "access/xact.h"
 #include "catalog/dependency.h"
@@ -253,19 +249,9 @@ worker_cleanup_job_schema_cache(PG_FUNCTION_ARGS)
 StringInfo
 JobSchemaName(uint64 jobId)
 {
-	/*
-	 * We need to apply padding on our 64-bit job id, and therefore cannot use
-	 * UINT64_FORMAT here.
-	 */
-#ifdef HAVE_INTTYPES_H
 	StringInfo jobSchemaName = makeStringInfo();
-	appendStringInfo(jobSchemaName, "%s%0*" PRIu64, JOB_SCHEMA_PREFIX,
+	appendStringInfo(jobSchemaName, "%s%0*" INT64_MODIFIER "u", JOB_SCHEMA_PREFIX,
 					 MIN_JOB_DIRNAME_WIDTH, jobId);
-#else
-	StringInfo jobSchemaName = makeStringInfo();
-	appendStringInfo(jobSchemaName, "%s%0*llu",
-					 JOB_SCHEMA_PREFIX, MIN_JOB_DIRNAME_WIDTH, jobId);
-#endif
 
 	return jobSchemaName;
 }
diff --git a/src/backend/distributed/worker/worker_partition_protocol.c b/src/backend/distributed/worker/worker_partition_protocol.c
index 7eee958b2..e511ae0cd 100644
--- a/src/backend/distributed/worker/worker_partition_protocol.c
+++ b/src/backend/distributed/worker/worker_partition_protocol.c
@@ -18,9 +18,6 @@
 #include "funcapi.h"
 
 #include <arpa/inet.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
 #include <netinet/in.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -449,20 +446,12 @@ StringInfo
 JobDirectoryName(uint64 jobId)
 {
 	/*
-	 * We use the default tablespace in {datadir}/base. Further, we need to
-	 * apply padding on our 64-bit job id, and hence can't use UINT64_FORMAT.
+	 * We use the default tablespace in {datadir}/base.
 	 */
-#ifdef HAVE_INTTYPES_H
 	StringInfo jobDirectoryName = makeStringInfo();
-	appendStringInfo(jobDirectoryName, "base/%s/%s%0*" PRIu64,
+	appendStringInfo(jobDirectoryName, "base/%s/%s%0*" INT64_MODIFIER "u",
 					 PG_JOB_CACHE_DIR, JOB_DIRECTORY_PREFIX,
 					 MIN_JOB_DIRNAME_WIDTH, jobId);
-#else
-	StringInfo jobDirectoryName = makeStringInfo();
-	appendStringInfo(jobDirectoryName, "base/%s/%s%0*llu",
-					 PG_JOB_CACHE_DIR, JOB_DIRECTORY_PREFIX,
-					 MIN_JOB_DIRNAME_WIDTH, jobId);
-#endif
 
 	return jobDirectoryName;
 }