From 0d368f39dc40aa9c33a8bd6d8de8afba516ef04b Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Wed, 27 Apr 2011 21:16:04 +0000
Subject: [PATCH] Fix some header files in the FFI.

---
 src/ffi/ffi-test.c.stay | 4 ++++
 src/ffi/ffi-test.h      | 3 ---
 src/ffi/generator.scm   | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ffi/ffi-test.c.stay b/src/ffi/ffi-test.c.stay
index 033715697..8cd9d30d4 100644
--- a/src/ffi/ffi-test.c.stay
+++ b/src/ffi/ffi-test.c.stay
@@ -2,6 +2,10 @@
 
 /* A test library; used to test the C/Unix FFI. */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "ffi-test.h"
 
 static void *callback_data;
diff --git a/src/ffi/ffi-test.h b/src/ffi/ffi-test.h
index f8e5aebcc..215437925 100644
--- a/src/ffi/ffi-test.h
+++ b/src/ffi/ffi-test.h
@@ -2,9 +2,6 @@
 
 /* Header for a test library; used to test the C/Unix FFI. */
 
-#include <string.h>
-#include <stdio.h>
-
 typedef struct {
 
   char first;
diff --git a/src/ffi/generator.scm b/src/ffi/generator.scm
index f1f262769..4c0ce2443 100644
--- a/src/ffi/generator.scm
+++ b/src/ffi/generator.scm
@@ -495,6 +495,8 @@ Scm_"name" ("arglist")
 /* Prefix */
 "prefix"
 /* End Prefix */
+
+#include <stdio.h>
 " (basics-grovel-func) (enums-grovel-func includes)))
       (flush-output)
       (let* ((structs (gen-struct-grovel-funcs includes))
-- 
2.25.1