8 files changed, 9 insertions, 4 deletions

diff --git a/apps/gui/list.c b/apps/gui/list.c
index de76310e0b..ef2711d7c9 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -20,6 +20,7 @@
  ****************************************************************************/
 
 #include <stdarg.h>
+#include <stdio.h>
 #include "config.h"
 #include "lcd.h"
 #include "font.h"
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c
index 0186c26106..cf2b55da8b 100644
--- a/firmware/drivers/lcd-charcell.c
+++ b/firmware/drivers/lcd-charcell.c
@@ -19,6 +19,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
+#include <stdio.h>
 #include "config.h"
 #include "hwcompat.h"
 #include "stdarg.h"
diff --git a/firmware/target/arm/lcd-c200_c200v2.c b/firmware/target/arm/lcd-c200_c200v2.c
index 14749aa1ff..45a37d9d7b 100644
--- a/firmware/target/arm/lcd-c200_c200v2.c
+++ b/firmware/target/arm/lcd-c200_c200v2.c
@@ -18,7 +18,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include "inttypes.h"
+#include <sys/types.h>
 
 #include "config.h"
 #include "cpu.h"
diff --git a/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
index 93abd300ec..500120a432 100644
--- a/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
@@ -18,7 +18,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include "inttypes.h"
+#include <sys/types.h>
 
 #include "config.h"
 #include "cpu.h"
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
index 3f1e621b54..b11c9f0fd5 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
@@ -18,6 +18,7 @@
 * KIND, either express or implied.
 *
 ****************************************************************************/
+#include <sys/types.h>
 #include "config.h"
 
 #include "hwcompat.h"
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
index ba56c3201c..3d65bcc092 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
@@ -22,6 +22,7 @@
  *
  ****************************************************************************/
 
+#include <sys/types.h>
 #include "config.h"
 #include "cpu.h"
 #include "string.h"
diff --git a/firmware/target/sh/archos/recorder/powermgmt-recorder.c b/firmware/target/sh/archos/recorder/powermgmt-recorder.c
index 70373a30ec..47f0093456 100644
--- a/firmware/target/sh/archos/recorder/powermgmt-recorder.c
+++ b/firmware/target/sh/archos/recorder/powermgmt-recorder.c
@@ -21,7 +21,7 @@
  ****************************************************************************/
 #include "config.h"
 #include "system.h"
-#include <sprintf.h>
+#include <stdio.h>
 #include "debug.h"
 #include "storage.h"
 #include "adc.h"
diff --git a/uisimulator/common/sim_icons.c b/uisimulator/common/sim_icons.c
index cfba2b7aa3..6492c9addf 100644
--- a/uisimulator/common/sim_icons.c
+++ b/uisimulator/common/sim_icons.c
@@ -18,12 +18,12 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include <stdio.h>
 #include "config.h"
 #ifdef HAVE_LCD_CHARCELLS
 
 #include <lcd.h>
 #include <kernel.h>
-#include <sprintf.h>
 #include <string.h>
 #include <debug.h>