diff --git a/common/ffsparser.cpp b/common/ffsparser.cpp
index 1f52d56..754b97a 100644
--- a/common/ffsparser.cpp
+++ b/common/ffsparser.cpp
@@ -10,15 +10,15 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 */
 
+// A workaround for compilers not supporting c++11 and c11
+// for using PRIX64.
+#define __STDC_FORMAT_MACROS
+
 #include "ffsparser.h"
 
 #include <map>
 #include <algorithm>
-#ifdef __WIN32__ // To workaround PRIX64 issues
-#include <cinttypes>
-#else
 #include <inttypes.h>
-#endif
 
 #include "descriptor.h"
 #include "ffs.h"
diff --git a/common/nvramparser.cpp b/common/nvramparser.cpp
index 16c7edb..e7dcb7a 100644
--- a/common/nvramparser.cpp
+++ b/common/nvramparser.cpp
@@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 */
 
-#ifdef __WIN32__ // To workaround PRIX64 issues
-#include <cinttypes>
-#else
+// A workaround for compilers not supporting c++11 and c11
+// for using PRIX64.
+#define __STDC_FORMAT_MACROS
+
 #include <inttypes.h>
-#endif
 #include <map>
 
 #include "nvramparser.h"