diff --git a/Makefile.am b/Makefile.am
index 70d899350..4b98f407c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -596,6 +596,7 @@ libxiph_a_SOURCES += \
 	src/lib/xiph/OggVisitor.cxx src/lib/xiph/OggVisitor.hxx \
 	src/lib/xiph/OggSerial.cxx src/lib/xiph/OggSerial.hxx \
 	src/lib/xiph/OggSyncState.cxx src/lib/xiph/OggSyncState.hxx \
+	src/lib/xiph/OggFind.cxx src/lib/xiph/OggFind.hxx \
 	src/lib/xiph/OggPage.hxx \
 	src/lib/xiph/OggStreamState.hxx
 endif
@@ -999,7 +1000,6 @@ endif
 
 if ENABLE_OPUS
 libdecoder_a_SOURCES += \
-	src/decoder/plugins/OggFind.cxx src/decoder/plugins/OggFind.hxx \
 	src/decoder/plugins/OpusDomain.cxx src/decoder/plugins/OpusDomain.hxx \
 	src/decoder/plugins/OpusReader.hxx \
 	src/decoder/plugins/OpusHead.hxx \
diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx
index 456f403fc..533715809 100644
--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "OpusDomain.hxx"
 #include "OpusHead.hxx"
 #include "OpusTags.hxx"
-#include "OggFind.hxx"
+#include "lib/xiph/OggFind.hxx"
 #include "lib/xiph/OggVisitor.hxx"
 #include "../DecoderAPI.hxx"
 #include "decoder/Reader.hxx"
diff --git a/src/decoder/plugins/OggFind.cxx b/src/lib/xiph/OggFind.cxx
similarity index 100%
rename from src/decoder/plugins/OggFind.cxx
rename to src/lib/xiph/OggFind.cxx
diff --git a/src/decoder/plugins/OggFind.hxx b/src/lib/xiph/OggFind.hxx
similarity index 100%
rename from src/decoder/plugins/OggFind.hxx
rename to src/lib/xiph/OggFind.hxx