diff --git a/source/quickerNES/core/apu/NESEffectsBuffer.cpp b/source/quickerNES/core/apu/NESEffectsBuffer.cpp
index 488c957..60e5098 100644
--- a/source/quickerNES/core/apu/NESEffectsBuffer.cpp
+++ b/source/quickerNES/core/apu/NESEffectsBuffer.cpp
@@ -27,12 +27,6 @@ Nes_Effects_Buffer::Nes_Effects_Buffer() : Effects_Buffer(true) // nes never use
 
 Nes_Effects_Buffer::~Nes_Effects_Buffer() {}
 
-Multi_Buffer *set_apu(Nes_Effects_Buffer *buf, Apu *apu)
-{
-  buf->set_apu(apu);
-  return buf;
-}
-
 void Nes_Effects_Buffer::enable_nonlinearity(bool b)
 {
   if (b) clear();
diff --git a/source/quickerNES/core/apu/buffer.cpp b/source/quickerNES/core/apu/buffer.cpp
index 3b5088e..6200592 100644
--- a/source/quickerNES/core/apu/buffer.cpp
+++ b/source/quickerNES/core/apu/buffer.cpp
@@ -23,12 +23,6 @@ Buffer::Buffer() : Multi_Buffer(1) {}
 
 Buffer::~Buffer() {}
 
-Multi_Buffer *set_apu(Buffer *buf, Apu *apu)
-{
-  buf->set_apu(apu);
-  return buf;
-}
-
 void Buffer::enable_nonlinearity(bool b)
 {
   if (b)
diff --git a/source/quickerNES/core/emu.cpp b/source/quickerNES/core/emu.cpp
index b6c6b10..b66cadf 100644
--- a/source/quickerNES/core/emu.cpp
+++ b/source/quickerNES/core/emu.cpp
@@ -3,6 +3,8 @@
 #include <cstring>
 #include "mappers/mapper.hpp"
 #include "emu.hpp"
+#include "apu/NESEffectsBuffer.hpp"
+#include "apu/buffer.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser
@@ -179,16 +181,26 @@ void Emu::write_chr( void const* p, long count, long offset )
 	emu.ppu.rebuild_chr( offset, end );
 }
 
+Multi_Buffer *set_apu(Nes_Effects_Buffer *buf, Apu *apu)
+{
+  buf->set_apu(apu);
+  return buf;
+}
+
+Multi_Buffer *set_apu(Buffer *buf, Apu *apu)
+{
+  buf->set_apu(apu);
+  return buf;
+}
+
 const char * Emu::set_sample_rate( long rate, class Buffer* buf )
 {
-	extern Multi_Buffer* set_apu( class Buffer*, Apu* );
 	auto_init();
 	return set_sample_rate( rate, set_apu( buf, &emu.impl->apu ) );
 }
 
 const char * Emu::set_sample_rate( long rate, class Nes_Effects_Buffer* buf )
 {
-	extern Multi_Buffer* set_apu( class Nes_Effects_Buffer*, Apu* );
 	auto_init();
 	return set_sample_rate( rate, set_apu( buf, &emu.impl->apu ) );
 }