normalizing includes

11 files changed, 15 insertions, 19 deletions

diff --git a/src/fabric.erl b/src/fabric.erl
index 9fdea34c..7f8f7e23 100644
--- a/src/fabric.erl
+++ b/src/fabric.erl
@@ -1,12 +1,10 @@
 -module(fabric).
 
--export([all_databases/1, create_db/2, delete_db/2, get_db_info/2,
-    db_path/2]).
+-export([all_databases/1, create_db/2, delete_db/2, get_db_info/2, db_path/2]).
 -export([open_doc/3, open_revs/4, get_missing_revs/2]).
 -export([update_doc/3, update_docs/3]).
 
--include("../../couch/src/couch_db.hrl").
-
+-include("fabric.hrl").
 
 % db operations
 -spec db_path(bstring(), bstring()) -> bstring().
diff --git a/src/fabric_all_databases.erl b/src/fabric_all_databases.erl
index 1b1d4d00..4bb5c5a5 100644
--- a/src/fabric_all_databases.erl
+++ b/src/fabric_all_databases.erl
@@ -3,9 +3,7 @@
 
 -export([all_databases/1]).
 
--include("../../couch/src/couch_db.hrl").
--include("../../dynomite/include/membership.hrl").
-
+-include("fabric.hrl").
 
 %% @doc gets all databases in the cluster.
 -spec all_databases(binary() | []) -> [binary()].
diff --git a/src/fabric_create_db.erl b/src/fabric_create_db.erl
index b0ff39ce..1e9bf256 100644
--- a/src/fabric_create_db.erl
+++ b/src/fabric_create_db.erl
@@ -3,9 +3,7 @@
 
 -export([create_db/2]).
 
--include("../../couch/src/couch_db.hrl").
--include("../../dynomite/include/membership.hrl").
-
+-include("fabric.hrl").
 
 %% @doc Create a new database, and all its partition files across the cluster
 %%      Options is proplist with user_ctx, n, q
diff --git a/src/fabric_delete_db.erl b/src/fabric_delete_db.erl
index 42faf763..cbcf0d5d 100644
--- a/src/fabric_delete_db.erl
+++ b/src/fabric_delete_db.erl
@@ -3,9 +3,7 @@
 
 -export([delete_db/2]).
 
--include("../../couch/src/couch_db.hrl").
--include("../../dynomite/include/membership.hrl").
-
+-include("fabric.hrl").
 
 %% @doc Delete a database, and all its partition files across the cluster
 %%      Options is proplist with user_ctx, n, q
diff --git a/src/fabric_get_db_info.erl b/src/fabric_get_db_info.erl
index cccfde6a..19e72e92 100644
--- a/src/fabric_get_db_info.erl
+++ b/src/fabric_get_db_info.erl
@@ -3,9 +3,7 @@
 
 -export([get_db_info/2]).
 
--include("../../couch/src/couch_db.hrl").
--include("../../dynomite/include/membership.hrl").
-
+-include("fabric.hrl").
 
 %% @doc get database information tuple
 get_db_info(DbName, Customer) ->
diff --git a/src/fabric_missing_revs.erl b/src/fabric_missing_revs.erl
index d329d2aa..ee7ea421 100644
--- a/src/fabric_missing_revs.erl
+++ b/src/fabric_missing_revs.erl
@@ -1,5 +1,7 @@
 -module(fabric_missing_revs).
+
 -export([go/2]).
+
 -include("fabric.hrl").
 
 go(DbName, AllIdsRevs) ->
diff --git a/src/fabric_open_doc.erl b/src/fabric_open_doc.erl
index 996282d8..3ea7d4ab 100644
--- a/src/fabric_open_doc.erl
+++ b/src/fabric_open_doc.erl
@@ -1,5 +1,7 @@
 -module(fabric_open_doc).
+
 -export([go/3]).
+
 -include("fabric.hrl").
 
 go(DbName, Id, Options) ->
diff --git a/src/fabric_open_revs.erl b/src/fabric_open_revs.erl
index c5bd586d..6847a2e5 100644
--- a/src/fabric_open_revs.erl
+++ b/src/fabric_open_revs.erl
@@ -1,5 +1,7 @@
 -module(fabric_open_revs).
+
 -export([go/4]).
+
 -include("fabric.hrl").
 
 go(DbName, Id, Revs, Options) ->
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index fa67b13f..2d1f6572 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -4,7 +4,6 @@
 -export([open_doc/3, open_revs/4, get_missing_revs/2, update_docs/3]).
 
 -include("fabric.hrl").
--include_lib("eunit/include/eunit.hrl").
 
 %% rpc endpoints
 %%  call to with_db will supply your M:F with a #db{} and then remaining args
diff --git a/src/fabric_update_docs.erl b/src/fabric_update_docs.erl
index 00c7e9d7..1281e40e 100644
--- a/src/fabric_update_docs.erl
+++ b/src/fabric_update_docs.erl
@@ -1,5 +1,7 @@
 -module(fabric_update_docs).
+
 -export([go/3]).
+
 -include("fabric.hrl").
 
 go(DbName, AllDocs, Options) ->
diff --git a/src/fabric_util.erl b/src/fabric_util.erl
index 936ba4ee..b6d68e09 100644
--- a/src/fabric_util.erl
+++ b/src/fabric_util.erl
@@ -2,8 +2,7 @@
 
 -export([submit_jobs/3, recv/4, receive_loop/4, receive_loop/6]).
 
--include("../../dynomite/include/membership.hrl").
--include_lib("eunit/include/eunit.hrl").
+-include("fabric.hrl").
 
 submit_jobs(Shards, EndPoint, ExtraArgs) ->
     lists:map(fun(#shard{node=Node, name=ShardName} = Shard) ->