diff --git a/src/drivers/drv_hrt.h b/src/drivers/drv_hrt.h
index a40943d3f2..a0bc87cf0b 100644
--- a/src/drivers/drv_hrt.h
+++ b/src/drivers/drv_hrt.h
@@ -41,6 +41,7 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
 #include <time.h>
diff --git a/src/drivers/px4flow/i2c_frame.h b/src/drivers/px4flow/i2c_frame.h
index b391b1f6a8..a682c5f3de 100644
--- a/src/drivers/px4flow/i2c_frame.h
+++ b/src/drivers/px4flow/i2c_frame.h
@@ -40,8 +40,9 @@
 
 #ifndef I2C_FRAME_H_
 #define I2C_FRAME_H_
-#include <inttypes.h>
 
+#define __STDC_FORMAT_MACROS 1
+#include <inttypes.h>
 
 typedef  struct i2c_frame
 {
diff --git a/src/modules/controllib/block/Block.hpp b/src/modules/controllib/block/Block.hpp
index d169d35c5f..bb2a0e2657 100644
--- a/src/modules/controllib/block/Block.hpp
+++ b/src/modules/controllib/block/Block.hpp
@@ -39,6 +39,7 @@
 
 #pragma once
 
+#define __STDC_FORMAT_MACROS
 #include <stdint.h>
 #include <inttypes.h>
 
diff --git a/src/modules/px4iofirmware/protocol.h b/src/modules/px4iofirmware/protocol.h
index 64ba0f93c4..673da0e44d 100644
--- a/src/modules/px4iofirmware/protocol.h
+++ b/src/modules/px4iofirmware/protocol.h
@@ -33,6 +33,7 @@
 
 #pragma once
 
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
 /**
diff --git a/src/modules/systemlib/uthash/uthash.h b/src/modules/systemlib/uthash/uthash.h
index 9f83fc34f1..a8642833f6 100644
--- a/src/modules/systemlib/uthash/uthash.h
+++ b/src/modules/systemlib/uthash/uthash.h
@@ -61,6 +61,7 @@ do {
 typedef unsigned int uint32_t;
 typedef unsigned char uint8_t;
 #else
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>   /* uint32_t */
 #endif
 
diff --git a/src/platforms/posix/px4_layer/drv_hrt.c b/src/platforms/posix/px4_layer/drv_hrt.c
index 6456008daa..10792b3089 100644
--- a/src/platforms/posix/px4_layer/drv_hrt.c
+++ b/src/platforms/posix/px4_layer/drv_hrt.c
@@ -43,6 +43,7 @@
 #include <semaphore.h>
 #include <time.h>
 #include <string.h>
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <errno.h>
 #include "hrt_work.h"
diff --git a/src/platforms/px4_nodehandle.h b/src/platforms/px4_nodehandle.h
index b0deef16c1..497f3be04c 100644
--- a/src/platforms/px4_nodehandle.h
+++ b/src/platforms/px4_nodehandle.h
@@ -48,6 +48,7 @@
 /* includes when building for ros */
 #include "ros/ros.h"
 #include <list>
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <type_traits>
 #else
diff --git a/src/systemcmds/tests/test_int.c b/src/systemcmds/tests/test_int.c
index 051a48e6c2..01092aa2d4 100644
--- a/src/systemcmds/tests/test_int.c
+++ b/src/systemcmds/tests/test_int.c
@@ -57,7 +57,6 @@
 
 #include <math.h>
 #include <float.h>
-#include <inttypes.h>
 
 
 /****************************************************************************