diff --git a/decoder/src/lib/golay.cc b/decoder/src/lib/golay.cc
new file mode 100644
index 0000000..e5efe28
--- /dev/null
+++ b/decoder/src/lib/golay.cc
@@ -0,0 +1,43 @@
+/* -*- 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
new file mode 100644
index 0000000..fc46eae
--- /dev/null
+++ b/decoder/src/lib/golay.h
@@ -0,0 +1,38 @@
+/* -*- 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 */