Index: libs/libmythmpeg2/cpu_accel.c
===================================================================
--- libs/libmythmpeg2/cpu_accel.c	(revision 20802)
+++ libs/libmythmpeg2/cpu_accel.c	(working copy)
@@ -127,7 +127,7 @@
 }
 #endif /* ARCH_X86 */
 
-#if defined(ACCEL_DETECT) && (defined(ARCH_PPC) || defined(ARCH_SPARC))
+#if defined(ACCEL_DETECT) && (ARCH_PPC || ARCH_SPARC)
 #include <signal.h>
 #include <setjmp.h>
 
Index: libs/libmythtv/RingBuffer.cpp
===================================================================
--- libs/libmythtv/RingBuffer.cpp	(revision 20802)
+++ libs/libmythtv/RingBuffer.cpp	(working copy)
@@ -255,9 +255,9 @@
                 else
                 {
                     lseek(fd2, 0, SEEK_SET);
-                    if (HAVE_POSIX_FADVISE)
+                    #if (HAVE_POSIX_FADVISE)
                         posix_fadvise(fd2, 0, 0, POSIX_FADV_SEQUENTIAL);
-
+                    #endif
                     openAttempts = 0;
                     break;
                 }
Index: libs/libmythtv/ThreadedFileWriter.cpp
===================================================================
--- libs/libmythtv/ThreadedFileWriter.cpp	(revision 20802)
+++ libs/libmythtv/ThreadedFileWriter.cpp	(working copy)
@@ -349,7 +349,7 @@
 {
     if (fd >= 0)
     {
-        if (HAVE_SYNC_FILE_RANGE)
+        #if (HAVE_SYNC_FILE_RANGE)
         {
             uint64_t write_position;
 
@@ -365,10 +365,11 @@
                 m_file_sync = write_position;
             }
         }
-        else if (HAVE_FDATASYNC)
+        #elif (HAVE_FDATASYNC)
             fdatasync(fd);
-        else
+        #else
             fsync(fd);
+        #endif
     }
 }
 
Index: filters/greedyhdeint/color.h
===================================================================
--- filters/greedyhdeint/color.h	(revision 20802)
+++ filters/greedyhdeint/color.h	(working copy)
@@ -1,20 +1,6 @@
 #ifndef _COLOR_H_
 #define _COLOR_H_
 
-void (*yv12_to_yuy2)
-  (const unsigned char *y_src, int y_src_pitch, 
-   const unsigned char *u_src, int u_src_pitch, 
-   const unsigned char *v_src, int v_src_pitch, 
-   unsigned char *yuy2_map, int yuy2_pitch,
-   int width, int height, int progressive);
-
-void (*yuy2_to_yv12)
-  (const unsigned char *yuy2_map, int yuy2_pitch,
-   unsigned char *y_dst, int y_dst_pitch, 
-   unsigned char *u_dst, int u_dst_pitch, 
-   unsigned char *v_dst, int v_dst_pitch, 
-   int width, int height);
-
 void init_yuv_conversion(void);
 
 void apply_chroma_filter( uint8_t *data, int stride, int width, int height );