diff --git a/msm8084/common.mk b/msm8084/common.mk
index bce4bccb..388596a6 100644
--- a/msm8084/common.mk
+++ b/msm8084/common.mk
@@ -37,6 +37,8 @@ ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
     common_flags += -DDEBUG_SWAPINTERVAL
 endif
 
+common_flags += -D__STDC_FORMAT_MACROS
+
 common_deps  :=
 kernel_includes :=
 
diff --git a/msm8084/libhwcomposer/hwc_vsync.cpp b/msm8084/libhwcomposer/hwc_vsync.cpp
index 9a661984..a9efc882 100644
--- a/msm8084/libhwcomposer/hwc_vsync.cpp
+++ b/msm8084/libhwcomposer/hwc_vsync.cpp
@@ -30,7 +30,6 @@
 #include "string.h"
 #include "external.h"
 #include "overlay.h"
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 namespace qhwc {
diff --git a/msm8084/libqdutils/profiler.cpp b/msm8084/libqdutils/profiler.cpp
index 232ca9c2..1cbea77e 100644
--- a/msm8084/libqdutils/profiler.cpp
+++ b/msm8084/libqdutils/profiler.cpp
@@ -28,7 +28,6 @@
  */
 
 #define LOG_NDDEBUG 0
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include "profiler.h"
diff --git a/msm8084/libqdutils/qdMetaData.cpp b/msm8084/libqdutils/qdMetaData.cpp
index 03905995..e710f652 100644
--- a/msm8084/libqdutils/qdMetaData.cpp
+++ b/msm8084/libqdutils/qdMetaData.cpp
@@ -31,7 +31,6 @@
 #include <sys/mman.h>
 #include <cutils/log.h>
 #include <gralloc_priv.h>
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include "qdMetaData.h"
 
diff --git a/msm8226/common.mk b/msm8226/common.mk
index 22bedc6d..a96d2d06 100644
--- a/msm8226/common.mk
+++ b/msm8226/common.mk
@@ -41,6 +41,8 @@ ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
     common_flags += -DDEBUG_SWAPINTERVAL
 endif
 
+common_flags += -D__STDC_FORMAT_MACROS
+
 common_deps  :=
 kernel_includes :=
 
diff --git a/msm8226/libhwcomposer/hwc_vsync.cpp b/msm8226/libhwcomposer/hwc_vsync.cpp
index ee3580cb..81661921 100644
--- a/msm8226/libhwcomposer/hwc_vsync.cpp
+++ b/msm8226/libhwcomposer/hwc_vsync.cpp
@@ -30,7 +30,6 @@
 #include "string.h"
 #include "external.h"
 #include "overlay.h"
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 namespace qhwc {
diff --git a/msm8226/libqdutils/profiler.cpp b/msm8226/libqdutils/profiler.cpp
index 232ca9c2..1cbea77e 100644
--- a/msm8226/libqdutils/profiler.cpp
+++ b/msm8226/libqdutils/profiler.cpp
@@ -28,7 +28,6 @@
  */
 
 #define LOG_NDDEBUG 0
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include "profiler.h"
diff --git a/msm8226/libqdutils/qdMetaData.cpp b/msm8226/libqdutils/qdMetaData.cpp
index dbd6f109..60386545 100644
--- a/msm8226/libqdutils/qdMetaData.cpp
+++ b/msm8226/libqdutils/qdMetaData.cpp
@@ -32,7 +32,6 @@
 #include <sys/mman.h>
 #include <cutils/log.h>
 #include <gralloc_priv.h>
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include "qdMetaData.h"
 
diff --git a/msm8909/common.mk b/msm8909/common.mk
index ce5828dc..2465cc86 100644
--- a/msm8909/common.mk
+++ b/msm8909/common.mk
@@ -42,6 +42,8 @@ ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
     common_flags += -DDEBUG_SWAPINTERVAL
 endif
 
+common_flags += -D__STDC_FORMAT_MACROS
+
 common_deps  :=
 kernel_includes :=
 
diff --git a/msm8909/libhwcomposer/hwc_vsync.cpp b/msm8909/libhwcomposer/hwc_vsync.cpp
index b876e0fe..579f43c8 100644
--- a/msm8909/libhwcomposer/hwc_vsync.cpp
+++ b/msm8909/libhwcomposer/hwc_vsync.cpp
@@ -31,7 +31,6 @@
 #include "qd_utils.h"
 #include "string.h"
 #include "overlay.h"
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 using namespace qdutils;
diff --git a/msm8909/libqdutils/profiler.cpp b/msm8909/libqdutils/profiler.cpp
index 810b0198..b183e6dd 100644
--- a/msm8909/libqdutils/profiler.cpp
+++ b/msm8909/libqdutils/profiler.cpp
@@ -28,7 +28,6 @@
  */
 
 #define LOG_NDDEBUG 0
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include "profiler.h"
diff --git a/msm8909/libqdutils/qdMetaData.cpp b/msm8909/libqdutils/qdMetaData.cpp
index 88109c97..9f8a3248 100644
--- a/msm8909/libqdutils/qdMetaData.cpp
+++ b/msm8909/libqdutils/qdMetaData.cpp
@@ -32,7 +32,6 @@
 #include <sys/mman.h>
 #include <cutils/log.h>
 #include <gralloc_priv.h>
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include "qdMetaData.h"
 
diff --git a/msm8994/common.mk b/msm8994/common.mk
index 5d5a4358..bbc22231 100644
--- a/msm8994/common.mk
+++ b/msm8994/common.mk
@@ -32,6 +32,8 @@ ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
     common_flags += -DDEBUG_SWAPINTERVAL
 endif
 
+common_flags += -D__STDC_FORMAT_MACROS
+
 common_deps  :=
 kernel_includes :=
 
diff --git a/msm8994/libhwcomposer/hwc_vsync.cpp b/msm8994/libhwcomposer/hwc_vsync.cpp
index 13945da0..f7218044 100644
--- a/msm8994/libhwcomposer/hwc_vsync.cpp
+++ b/msm8994/libhwcomposer/hwc_vsync.cpp
@@ -31,7 +31,6 @@
 #include "qd_utils.h"
 #include "string.h"
 #include "overlay.h"
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 using namespace qdutils;
diff --git a/msm8994/libqdutils/profiler.cpp b/msm8994/libqdutils/profiler.cpp
index 810b0198..b183e6dd 100644
--- a/msm8994/libqdutils/profiler.cpp
+++ b/msm8994/libqdutils/profiler.cpp
@@ -28,7 +28,6 @@
  */
 
 #define LOG_NDDEBUG 0
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include "profiler.h"
diff --git a/msm8994/libqdutils/qdMetaData.cpp b/msm8994/libqdutils/qdMetaData.cpp
index 88109c97..9f8a3248 100644
--- a/msm8994/libqdutils/qdMetaData.cpp
+++ b/msm8994/libqdutils/qdMetaData.cpp
@@ -32,7 +32,6 @@
 #include <sys/mman.h>
 #include <cutils/log.h>
 #include <gralloc_priv.h>
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include "qdMetaData.h"
 
diff --git a/msm8996/common.mk b/msm8996/common.mk
index 6b3e2e9c..ce7571be 100644
--- a/msm8996/common.mk
+++ b/msm8996/common.mk
@@ -42,6 +42,8 @@ ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
     common_flags += -DMASTER_SIDE_CP
 endif
 
+common_flags += -D__STDC_FORMAT_MACROS
+
 common_deps  :=
 kernel_includes :=
 
diff --git a/msm8996/libqdutils/profiler.cpp b/msm8996/libqdutils/profiler.cpp
index 810b0198..b183e6dd 100644
--- a/msm8996/libqdutils/profiler.cpp
+++ b/msm8996/libqdutils/profiler.cpp
@@ -28,7 +28,6 @@
  */
 
 #define LOG_NDDEBUG 0
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include "profiler.h"
diff --git a/msm8996/libqdutils/qdMetaData.cpp b/msm8996/libqdutils/qdMetaData.cpp
index 4ada44b6..321107db 100644
--- a/msm8996/libqdutils/qdMetaData.cpp
+++ b/msm8996/libqdutils/qdMetaData.cpp
@@ -32,7 +32,6 @@
 #include <sys/mman.h>
 #include <cutils/log.h>
 #include <gralloc_priv.h>
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include "qdMetaData.h"
 
diff --git a/msm8996/sdm/libs/core/fb/hw_device.cpp b/msm8996/sdm/libs/core/fb/hw_device.cpp
index c707847d..3f665285 100644
--- a/msm8996/sdm/libs/core/fb/hw_device.cpp
+++ b/msm8996/sdm/libs/core/fb/hw_device.cpp
@@ -27,8 +27,6 @@
 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define __STDC_FORMAT_MACROS
-
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>
diff --git a/msmcobalt/common.mk b/msmcobalt/common.mk
index af72e7b6..d7370edb 100644
--- a/msmcobalt/common.mk
+++ b/msmcobalt/common.mk
@@ -53,6 +53,8 @@ ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
     common_flags += -DMASTER_SIDE_CP
 endif
 
+common_flags += -D__STDC_FORMAT_MACROS
+
 common_deps  :=
 kernel_includes :=
 
diff --git a/msmcobalt/libqdutils/profiler.cpp b/msmcobalt/libqdutils/profiler.cpp
index 810b0198..b183e6dd 100644
--- a/msmcobalt/libqdutils/profiler.cpp
+++ b/msmcobalt/libqdutils/profiler.cpp
@@ -28,7 +28,6 @@
  */
 
 #define LOG_NDDEBUG 0
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
 #include "profiler.h"
diff --git a/msmcobalt/libqdutils/qdMetaData.cpp b/msmcobalt/libqdutils/qdMetaData.cpp
index 51dfa82e..0f3b5e50 100644
--- a/msmcobalt/libqdutils/qdMetaData.cpp
+++ b/msmcobalt/libqdutils/qdMetaData.cpp
@@ -32,7 +32,6 @@
 #include <sys/mman.h>
 #include <cutils/log.h>
 #include <gralloc_priv.h>
-#define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include "qdMetaData.h"
 
diff --git a/msmcobalt/sdm/libs/core/fb/hw_device.cpp b/msmcobalt/sdm/libs/core/fb/hw_device.cpp
index ca43dd2f..d6962fd3 100644
--- a/msmcobalt/sdm/libs/core/fb/hw_device.cpp
+++ b/msmcobalt/sdm/libs/core/fb/hw_device.cpp
@@ -27,8 +27,6 @@
 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define __STDC_FORMAT_MACROS
-
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>