diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index b07e115..c49a886 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -19,7 +19,9 @@
 //#define LOG_NDEBUG 0
 
 #include <gui/BufferQueue.h>
+#include <gui/BufferQueueConsumer.h>
 #include <gui/BufferQueueCore.h>
+#include <gui/BufferQueueProducer.h>
 
 namespace android {
 
@@ -43,6 +45,13 @@
     }
 }
 
+void BufferQueue::ProxyConsumerListener::onSidebandStreamChanged() {
+    sp<ConsumerListener> listener(mConsumerListener.promote());
+    if (listener != NULL) {
+        listener->onSidebandStreamChanged();
+    }
+}
+
 void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,
         sp<IGraphicBufferConsumer>* outConsumer,
         const sp<IGraphicBufferAlloc>& allocator) {
@@ -67,151 +76,4 @@
     *outConsumer = consumer;
 }
 
-BufferQueue::BufferQueue(const sp<IGraphicBufferAlloc>& allocator) :
-    mProducer(),
-    mConsumer()
-{
-    sp<BufferQueueCore> core(new BufferQueueCore(allocator));
-    mProducer = new BufferQueueProducer(core);
-    mConsumer = new BufferQueueConsumer(core);
-}
-
-BufferQueue::~BufferQueue() {}
-
-void BufferQueue::binderDied(const wp<IBinder>& who) {
-    mProducer->binderDied(who);
-}
-
-int BufferQueue::query(int what, int* outValue) {
-    return mProducer->query(what, outValue);
-}
-
-status_t BufferQueue::setBufferCount(int bufferCount) {
-    return mProducer->setBufferCount(bufferCount);
-}
-
-status_t BufferQueue::requestBuffer(int slot, sp<GraphicBuffer>* buf) {
-    return mProducer->requestBuffer(slot, buf);
-}
-
-status_t BufferQueue::dequeueBuffer(int *outBuf, sp<Fence>* outFence, bool async,
-        uint32_t w, uint32_t h, uint32_t format, uint32_t usage) {
-    return mProducer->dequeueBuffer(outBuf, outFence, async, w, h, format, usage);
-}
-
-status_t BufferQueue::detachProducerBuffer(int slot) {
-    return mProducer->detachBuffer(slot);
-}
-
-status_t BufferQueue::detachNextBuffer(sp<GraphicBuffer>* outBuffer,
-        sp<Fence>* outFence) {
-    return mProducer->detachNextBuffer(outBuffer, outFence);
-}
-
-status_t BufferQueue::attachProducerBuffer(int* slot,
-        const sp<GraphicBuffer>& buffer) {
-    return mProducer->attachBuffer(slot, buffer);
-}
-
-status_t BufferQueue::queueBuffer(int buf,
-        const QueueBufferInput& input, QueueBufferOutput* output) {
-    return mProducer->queueBuffer(buf, input, output);
-}
-
-void BufferQueue::cancelBuffer(int buf, const sp<Fence>& fence) {
-    mProducer->cancelBuffer(buf, fence);
-}
-
-status_t BufferQueue::connect(const sp<IProducerListener>& listener,
-        int api, bool producerControlledByApp, QueueBufferOutput* output) {
-    return mProducer->connect(listener, api, producerControlledByApp, output);
-}
-
-status_t BufferQueue::disconnect(int api) {
-    return mProducer->disconnect(api);
-}
-
-status_t BufferQueue::setSidebandStream(const sp<NativeHandle>& stream) {
-    return mProducer->setSidebandStream(stream);
-}
-
-status_t BufferQueue::acquireBuffer(BufferItem* buffer, nsecs_t presentWhen) {
-    return mConsumer->acquireBuffer(buffer, presentWhen);
-}
-
-status_t BufferQueue::detachConsumerBuffer(int slot) {
-    return mConsumer->detachBuffer(slot);
-}
-
-status_t BufferQueue::attachConsumerBuffer(int* slot,
-        const sp<GraphicBuffer>& buffer) {
-    return mConsumer->attachBuffer(slot, buffer);
-}
-
-status_t BufferQueue::releaseBuffer(
-        int buf, uint64_t frameNumber, EGLDisplay display,
-        EGLSyncKHR eglFence, const sp<Fence>& fence) {
-    return mConsumer->releaseBuffer(buf, frameNumber, fence, display, eglFence);
-}
-
-status_t BufferQueue::consumerConnect(const sp<IConsumerListener>& consumerListener,
-        bool controlledByApp) {
-    return mConsumer->connect(consumerListener, controlledByApp);
-}
-
-status_t BufferQueue::consumerDisconnect() {
-    return mConsumer->disconnect();
-}
-
-status_t BufferQueue::getReleasedBuffers(uint64_t* slotMask) {
-    return mConsumer->getReleasedBuffers(slotMask);
-}
-
-status_t BufferQueue::setDefaultBufferSize(uint32_t w, uint32_t h) {
-    return mConsumer->setDefaultBufferSize(w, h);
-}
-
-status_t BufferQueue::setDefaultMaxBufferCount(int bufferCount) {
-    return mConsumer->setDefaultMaxBufferCount(bufferCount);
-}
-
-status_t BufferQueue::disableAsyncBuffer() {
-    return mConsumer->disableAsyncBuffer();
-}
-
-status_t BufferQueue::setMaxAcquiredBufferCount(int maxAcquiredBuffers) {
-    return mConsumer->setMaxAcquiredBufferCount(maxAcquiredBuffers);
-}
-
-void BufferQueue::setConsumerName(const String8& name) {
-    mConsumer->setConsumerName(name);
-}
-
-status_t BufferQueue::setDefaultBufferFormat(uint32_t defaultFormat) {
-    return mConsumer->setDefaultBufferFormat(defaultFormat);
-}
-
-status_t BufferQueue::setConsumerUsageBits(uint32_t usage) {
-    return mConsumer->setConsumerUsageBits(usage);
-}
-
-status_t BufferQueue::setTransformHint(uint32_t hint) {
-    return mConsumer->setTransformHint(hint);
-}
-
-sp<NativeHandle> BufferQueue::getSidebandStream() const {
-    return mConsumer->getSidebandStream();
-}
-
-void BufferQueue::dump(String8& result, const char* prefix) const {
-    mConsumer->dump(result, prefix);
-}
-
-void BufferQueue::ProxyConsumerListener::onSidebandStreamChanged() {
-    sp<ConsumerListener> listener(mConsumerListener.promote());
-    if (listener != NULL) {
-        listener->onSidebandStreamChanged();
-    }
-}
-
 }; // namespace android