diff --git a/cdparanoia-III-alpha9.8-headers.patch b/cdparanoia-III-alpha9.8-headers.patch
new file mode 100644
index 0000000..6f56ccc
--- /dev/null
+++ b/cdparanoia-III-alpha9.8-headers.patch
@@ -0,0 +1,22 @@
+diff -up cdparanoia-III-alpha9.8/header.c.jx cdparanoia-III-alpha9.8/header.c
+--- cdparanoia-III-alpha9.8/header.c.jx	1999-08-15 18:34:58.000000000 -0400
++++ cdparanoia-III-alpha9.8/header.c	2008-03-20 13:23:33.000000000 -0400
+@@ -10,6 +10,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ static void PutNum(long num,int f,int endianness,int bytes){
+   int i;
+diff -up cdparanoia-III-alpha9.8/paranoia/gap.c.jx cdparanoia-III-alpha9.8/paranoia/gap.c
+--- cdparanoia-III-alpha9.8/paranoia/gap.c.jx	2000-04-19 18:41:04.000000000 -0400
++++ cdparanoia-III-alpha9.8/paranoia/gap.c	2008-03-20 13:23:12.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include "p_block.h"
+ #include "cdda_paranoia.h"
+ #include "gap.h"
++#include <string.h>
+ 
+ /**** Gap analysis code ***************************************************/
+ 
diff --git a/cdparanoia.spec b/cdparanoia.spec
index 9e31226..3cf2192 100644
--- a/cdparanoia.spec
+++ b/cdparanoia.spec
@@ -3,7 +3,7 @@
 
 Name: cdparanoia
 Version: %{realver}
-Release: 29
+Release: 30
 License: GPL
 Group: Applications/Multimedia
 Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz 
@@ -19,6 +19,7 @@ Patch8: cdparanoia-III-alpha9.8.env.patch
 Patch9: cdparanoia-III-alpha9.8.smalldma.patch
 Patch10: cdparanoia-III-alpha9.8.lm.patch
 Patch11: cdparanoia-III-alpha9.8.scsi-setspeed.patch
+Patch12: cdparanoia-III-alpha9.8-headers.patch
 Url: http://www.xiph.org/paranoia/index.html
 BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
 Requires: cdparanoia-libs = %{version}-%{release}
@@ -66,10 +67,11 @@ applications which read CD Digital Audio disks.
 %patch9 -p1 -b .smalldma
 %patch10 -p1 -b .lm
 %patch11 -p1 -b .setspeed
+%patch12 -p1 -b .headers
 
 %build
 rm -rf $RPM_BUILD_ROOT
-export OPT="${CFLAGS:-%optflags} -O0 -Wno-pointer-sign -Wno-unused"
+export OPT="${CFLAGS:-%optflags} -O0 -Wno-pointer-sign -Wno-unused -Werror-implicit-function-declaration"
 %configure --includedir=%{_includedir}/cdda
 make OPT="$OPT"
 
@@ -125,6 +127,10 @@ fi
 %{_libdir}/*.a
 
 %changelog
+* Thu Mar 20 2008 Adam Jackson <ajax@redhat.com> alpha9.8-30
+- Add -Werror-implicit-function-declarations.
+- cdparanoia-III-alpha9.8-headers.patch: Fix the resulting errors.
+
 * Tue Mar 04 2008 Adam Jackson <ajax@redhat.com> alpha9.8-29
 - cdparanoia-III-alpha9.8.scsi-setspeed.patch: Allow setting the speed of
   SCSI CD drives. (#431178)