--- cinepaint/app/base_frame_manager.c
+++ cinepaint/app/base_frame_manager.c
@@ -13,6 +13,9 @@
    - bfm_check() has become public
 */ 
 
+
+#include <sys/stat.h>
+#include <sys/types.h>
 #include "base_frame_manager.h"
 #include "store_frame_manager.h"
 #include "clone.h"
--- cinepaint/app/object.c
+++ cinepaint/app/object.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "object.h"
 #include "objectF.h"
 #include "objectP.h"
--- cinepaint/libgimp/stdplugins-intl.h
+++ cinepaint/libgimp/stdplugins-intl.h
@@ -23,6 +23,7 @@
 #define __STDPLUGINS_INTL_H__
 
 #include "gimpintl.h"
+#include <stdlib.h>
 
 #if defined (HAVE_BIND_TEXTDOMAIN_CODESET) && defined (GDK_WINDOWING_WIN32)
 #define BTDCS(d) bind_textdomain_codeset (d, "UTF-8")
--- cinepaint/lib/drawable.c
+++ cinepaint/lib/drawable.c
@@ -16,6 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */                                                                             
+#include <string.h>
 #include "plugin_main.h"
 #include "../lib/wire/libtile.h"
 
--- cinepaint/lib/wire/wirebuffer.c
+++ cinepaint/lib/wire/wirebuffer.c
@@ -5,6 +5,7 @@
 */
 
 #include <stdio.h>
+#include <string.h>
 #include "wire.h"
 #include "wirebuffer.h"
 #include "iodebug.h"
--- cinepaint/plug-ins/iol/parser.tab.c
+++ cinepaint/plug-ins/iol/parser.tab.c
@@ -33,6 +33,8 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
+//#include <FlexLexer.h>
+
 /* Identify Bison output.  */
 #define YYBISON 1
 
--- cinepaint/app/app_procs.c
+++ cinepaint/app/app_procs.c
@@ -23,6 +23,7 @@
 #include "../lib/version.h"
 #include "../lib/wire/datadir.h"
 #include "libgimp/gimpintl.h"
+#include "store_frame_manager.h"
 
 #ifdef WIN32
 
--- cinepaint/app/gdisplay.c
+++ cinepaint/app/gdisplay.c
@@ -48,6 +48,7 @@
 #include "tools.h"
 #include "undo.h"
 #include "base_frame_manager.h"
+#include "store_frame_manager.h"
 
 #include "layer_pvt.h"			/* ick. */
 
--- cinepaint/app/look_profile.c
+++ cinepaint/app/look_profile.c
@@ -23,6 +23,7 @@
 #include "buttons/look_profile_apply.xpm"
 #include "buttons/look_profile_apply_all.xpm"
 #include "window_icon.h"
+#include "store_frame_manager.h"