Minimise includes of dcp/ headers

Change-Id: Ic9a737cfd50b8f665b52f90dc59f38b71eeaac99
Reviewed-on: http://review.couchbase.org/113439
Tested-by: Build Bot <[email protected]>
Reviewed-by: Trond Norbye <[email protected]>

Author: daverigby

engines/ep/src/dcp/flow-control-manager.h

@@ -16,11 +16,14 @@
  */
 #pragma once
 
+#include "memcached/types.h"
+
 #include <atomic>
+#include <map>
 #include <mutex>
 
-#include "memcached/types.h"
-#include "dcp/consumer.h"
+class DcpConsumer;
+class EventuallyPersistentEngine;
 
 /**
  * DcpFlowControlManager is a base class for handling/enforcing flow control

engines/ep/src/dcp/flow-control.cc

@@ -15,9 +15,10 @@
  *   limitations under the License.
  */
 
+#include "dcp/flow-control.h"
 #include "connhandler_impl.h"
+#include "dcp/consumer.h"
 #include "dcp/flow-control-manager.h"
-#include "dcp/flow-control.h"
 #include "ep_engine.h"
 #include "ep_time.h"
 #include "objectregistry.h"

engines/ep/tests/mock/mock_stream.cc

@@ -18,8 +18,8 @@
 #include "mock_stream.h"
 #include "checkpoint_manager.h"
 #include "dcp/response.h"
+#include "mock_dcp_producer.h"
 #include "vbucket.h"
-
 MockActiveStream::MockActiveStream(EventuallyPersistentEngine* e,
                                    std::shared_ptr<MockDcpProducer> p,
                                    uint32_t flags,

engines/ep/tests/mock/mock_stream.h

@@ -18,13 +18,10 @@
 #pragma once
 
 #include "dcp/active_stream.h"
-#include "dcp/consumer.h"
 #include "dcp/passive_stream.h"
-#include "dcp/producer.h"
-#include "dcp/stream.h"
-#include "tests/mock/mock_dcp_producer.h"
 
 class CheckpointManager;
+class MockDcpProducer;
 
 /*
  * Mock of the ActiveStream class. Wraps the real ActiveStream, but exposes

engines/ep/tests/module_tests/dcp_durability_stream_test.cc

@@ -31,6 +31,7 @@
 
 #include "../mock/mock_checkpoint_manager.h"
 #include "../mock/mock_dcp_consumer.h"
+#include "../mock/mock_dcp_producer.h"
 #include "../mock/mock_stream.h"
 #include "../mock/mock_synchronous_ep_engine.h"
 

engines/ep/tests/module_tests/evp_store_rollback_test.cc

@@ -36,6 +36,7 @@
 #include "tests/mock/mock_checkpoint_manager.h"
 #include "tests/mock/mock_dcp.h"
 #include "tests/mock/mock_dcp_consumer.h"
+#include "tests/mock/mock_dcp_producer.h"
 #include "tests/mock/mock_stream.h"
 #include "tests/mock/mock_synchronous_ep_engine.h"
 #include "tests/module_tests/collections/test_manifest.h"