diff --git a/apps/menu.c b/apps/menu.c
index 539dc900a5..348095cd31 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -30,6 +30,7 @@
 
 #include "lcd.h"
 #include "font.h"
+#include "file.h"
 #include "menu.h"
 #include "button.h"
 #include "kernel.h"
diff --git a/bootloader/common.c b/bootloader/common.c
index f7ab661ca2..c9b2bfb7a3 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -34,6 +34,7 @@
 #include "button.h"
 #include "string.h"
 #include "usb.h"
+#include "file.h"
 
 /* TODO: Other bootloaders need to be adjusted to set this variable to true
    on a button press - currently only the ipod, H10 and Sansa versions do. */
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c
index bddf03c5f6..c8d8b8a81e 100644
--- a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c
@@ -18,6 +18,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include <sys/types.h>
 
 #include "config.h"
 #include "cpu.h"
diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c
index 613cc759ee..ecd28bb7c3 100644
--- a/firmware/target/arm/ipod/video/lcd-video.c
+++ b/firmware/target/arm/ipod/video/lcd-video.c
@@ -25,6 +25,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include <sys/types.h>
+
 #include "config.h"
 #include "cpu.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/lcd-c200_c200v2.c b/firmware/target/arm/lcd-c200_c200v2.c
index 6665d6ab33..06cb475d9d 100644
--- a/firmware/target/arm/lcd-c200_c200v2.c
+++ b/firmware/target/arm/lcd-c200_c200v2.c
@@ -18,6 +18,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include <sys/types.h>
+
 #include "config.h"
 #include "cpu.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
index 6bb0668352..500120a432 100755
--- a/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/lcd-hdd1630.c
@@ -18,6 +18,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include <sys/types.h>
+
 #include "config.h"
 #include "cpu.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
index 388c02ade4..661ae8e6a9 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
@@ -18,6 +18,8 @@
 * KIND, either express or implied.
 *
 ****************************************************************************/
+#include <sys/types.h>
+
 #include "config.h"
 #include "system.h"
 #include "cpu.h"
diff --git a/firmware/target/arm/samsung/yh820/lcd-yh820.c b/firmware/target/arm/samsung/yh820/lcd-yh820.c
index d21f6c2854..76ecdd293e 100644
--- a/firmware/target/arm/samsung/yh820/lcd-yh820.c
+++ b/firmware/target/arm/samsung/yh820/lcd-yh820.c
@@ -18,6 +18,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include <sys/types.h>
+
 #include "config.h"
 #include "cpu.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
index d0b7e9214e..034a53a022 100644
--- a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
@@ -18,8 +18,9 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include "config.h"
+#include <sys/types.h>
 
+#include "config.h"
 #include "hwcompat.h"
 #include "kernel.h"
 #include "lcd.h"
diff --git a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c
index e3b1bd918b..edde538c99 100644
--- a/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/lcd-jz4740.c
@@ -18,7 +18,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
- 
+#include <sys/types.h>
+
 #include "config.h"
 #include "jz4740.h"
 #include "lcd.h"
diff --git a/uisimulator/sdl/lcd-charcells.c b/uisimulator/sdl/lcd-charcells.c
index 25611c90db..eb08ea2bef 100644
--- a/uisimulator/sdl/lcd-charcells.c
+++ b/uisimulator/sdl/lcd-charcells.c
@@ -23,7 +23,8 @@
 #include "lcd.h"
 #include "lcd-charcell.h"
 #include "screendump.h"
-#include "general.h"          
+#include "general.h"   
+#include "file.h"       
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>