diff --git a/decoder/INSTALL b/decoder/INSTALL
index 2550dab..8b82ade 100644
--- a/decoder/INSTALL
+++ b/decoder/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2006, 2007, 2008 Free Software Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+     ./configure CC="cc -Ae"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,16 +174,6 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
 Specifying the System Type
 ==========================
 
@@ -199,8 +189,7 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS
-     KERNEL-OS
+     OS KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
diff --git a/decoder/src/lib/golay.cc b/decoder/src/lib/golay.cc
deleted file mode 100644
index e5efe28..0000000
--- a/decoder/src/lib/golay.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- C++ -*- */
-/*
- * Copyright 2008 Steve Glass
- * 
- * This file is part of OP25.
- * 
- * OP25 is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * OP25 is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- * License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with OP25; see the file COPYING. If not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <bch.h>
-
-/*
- * APCO P25 Golay encoder.
- */
-uint64_t
-bch_64_encode(uint16_t val)
-{
-   // ToDo: implement me
-}
-
-/*
- * APCO P25 Golay decoder.
- */
-bool
-bch_64_decode(uint64_t& cw)
-{
-   // ToDo: implement me
-
-   return true;
-}
diff --git a/decoder/src/lib/golay.h b/decoder/src/lib/golay.h
deleted file mode 100644
index fc46eae..0000000
--- a/decoder/src/lib/golay.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- C++ -*- */
-/*
- * Copyright 2008 Steve Glass
- * 
- * This file is part of OP25.
- * 
- * OP25 is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * OP25 is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- * License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with OP25; see the file COPYING. If not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GOLAY_H
-#define INCLUDED_GOLAY_H
-
-#include <stdint.h>
-
-/*
- * APCO P25 Golay encoder.
- */
-extern uint64_t golay_64_encode(uint16_t val);
-
-/*
- * APCO P25 Golay decoder.
- */
-extern bool golay_64_decode(uint64_t& cw);
-
-#endif /* INCLUDED_GOLAY_H */
diff --git a/decoder/src/lib/sniffer_du_handler.cc b/decoder/src/lib/sniffer_du_handler.cc
index 98d7ae3..a156360 100644
--- a/decoder/src/lib/sniffer_du_handler.cc
+++ b/decoder/src/lib/sniffer_du_handler.cc
@@ -22,6 +22,7 @@
  */
 
 #include <cstring>
+#include <cstdio>
 #include <fcntl.h>
 #include <linux/if_tun.h>
 #include <net/if.h>
diff --git a/decoder/src/lib/value_string.h b/decoder/src/lib/value_string.h
index e3b5021..f8c686e 100644
--- a/decoder/src/lib/value_string.h
+++ b/decoder/src/lib/value_string.h
@@ -24,6 +24,7 @@
 #ifndef INCLUDED_VALUE_STRING
 #define INCLUDED_VALUE_STRING
 
+#include <stdint.h>
 #include <string>
 
 /*
diff --git a/decoder/src/lib/vc55_imbe_decoder.cc b/decoder/src/lib/vc55_imbe_decoder.cc
index 3ce518d..6ba8663 100644
--- a/decoder/src/lib/vc55_imbe_decoder.cc
+++ b/decoder/src/lib/vc55_imbe_decoder.cc
@@ -22,6 +22,7 @@
  */
 
 #include <cerrno>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <fcntl.h>