more cleanup of the includes

13 files changed, 11 insertions, 17 deletions

diff --git a/include/chttpd.hrl b/include/chttpd.hrl
deleted file mode 100644
index 54285bf2..00000000
--- a/include/chttpd.hrl
+++ /dev/null
@@ -1,2 +0,0 @@
--include_lib("couch/include/couch_db.hrl").
--include_lib("eunit/include/eunit.hrl").
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 93047b80..9851c97b 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -11,7 +11,7 @@
 % the License.
 
 -module(chttpd).
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -export([start_link/0, stop/0, handle_request/1, config_change/2,
     primary_header_value/2, header_value/2, header_value/3, qs_value/2, 
diff --git a/src/chttpd_app.erl b/src/chttpd_app.erl
index 4b8356fb..e8d6f21f 100644
--- a/src/chttpd_app.erl
+++ b/src/chttpd_app.erl
@@ -2,8 +2,6 @@
 -behaviour(application).
 -export([start/2, stop/1]).
 
--include("chttpd.hrl").
-
 start(_Type, StartArgs) ->
     chttpd_sup:start_link(StartArgs).
 
diff --git a/src/chttpd_auth.erl b/src/chttpd_auth.erl
index 33b6d176..b15bc933 100644
--- a/src/chttpd_auth.erl
+++ b/src/chttpd_auth.erl
@@ -11,7 +11,7 @@
 % the License.
 
 -module(chttpd_auth).
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -export([special_test_authentication_handler/1, null_authentication_handler/1,
     cookie_authentication_handler/1, default_authentication_handler/1,
diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl
index bffc29bf..579ac623 100644
--- a/src/chttpd_db.erl
+++ b/src/chttpd_db.erl
@@ -11,7 +11,7 @@
 % the License.
 
 -module(chttpd_db).
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -export([handle_request/1, handle_compact_req/2, handle_design_req/2,
     db_req/2, couch_doc_open/4,handle_changes_req/2,
diff --git a/src/chttpd_external.erl b/src/chttpd_external.erl
index 53420211..0b6b775d 100644
--- a/src/chttpd_external.erl
+++ b/src/chttpd_external.erl
@@ -18,7 +18,7 @@
 
 -import(chttpd,[send_error/4]).
 
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 % handle_external_req/2
 % for the old type of config usage:
diff --git a/src/chttpd_misc.erl b/src/chttpd_misc.erl
index 0aa666f6..98e6fbf8 100644
--- a/src/chttpd_misc.erl
+++ b/src/chttpd_misc.erl
@@ -21,7 +21,7 @@
 -export([increment_update_seq_req/2]).
 
 
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -import(chttpd,
     [send_json/2,send_json/3,send_json/4,send_method_not_allowed/2,
diff --git a/src/chttpd_oauth.erl b/src/chttpd_oauth.erl
index 58fafbb8..f0bffb36 100644
--- a/src/chttpd_oauth.erl
+++ b/src/chttpd_oauth.erl
@@ -11,7 +11,7 @@
 % the License.
 
 -module(chttpd_oauth).
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -export([oauth_authentication_handler/1, handle_oauth_req/1, consumer_lookup/2]).
 
diff --git a/src/chttpd_rewrite.erl b/src/chttpd_rewrite.erl
index 4aeaf31c..fbf246ab 100644
--- a/src/chttpd_rewrite.erl
+++ b/src/chttpd_rewrite.erl
@@ -17,7 +17,7 @@
 
 -module(chttpd_rewrite).
 -export([handle_rewrite_req/3]).
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -define(SEPARATOR, $\/).
 -define(MATCH_ALL, '*').
diff --git a/src/chttpd_show.erl b/src/chttpd_show.erl
index 37143386..9d67774a 100644
--- a/src/chttpd_show.erl
+++ b/src/chttpd_show.erl
@@ -14,7 +14,7 @@
 
 -export([handle_doc_show_req/3, handle_doc_update_req/3, handle_view_list_req/3]).
 
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -import(chttpd,
     [send_json/2,send_json/3,send_json/4,send_method_not_allowed/2,
diff --git a/src/chttpd_stats.erl b/src/chttpd_stats.erl
index 1e30c466..1200713a 100644
--- a/src/chttpd_stats.erl
+++ b/src/chttpd_stats.erl
@@ -11,8 +11,8 @@
 % the License.
 
 -module(chttpd_stats).
--include("chttpd.hrl").
--include("../../couch/src/couch_stats.hrl").
+-include_lib("couch/include/couch_db.hrl").
+-include_lib("couch/include/couch_stats.hrl").
 
 -export([handle_stats_req/1]).
 -import(chttpd,
diff --git a/src/chttpd_sup.erl b/src/chttpd_sup.erl
index c710ec37..4786350b 100644
--- a/src/chttpd_sup.erl
+++ b/src/chttpd_sup.erl
@@ -4,8 +4,6 @@
 
 -export([start_link/1]).
 
--include("chttpd.hrl").
-
 start_link(Args) ->
     supervisor:start_link({local,?MODULE}, ?MODULE, Args).
 
diff --git a/src/chttpd_view.erl b/src/chttpd_view.erl
index 7308f4bd..f3376af7 100644
--- a/src/chttpd_view.erl
+++ b/src/chttpd_view.erl
@@ -11,7 +11,7 @@
 % the License.
 
 -module(chttpd_view).
--include("chttpd.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -export([handle_view_req/3,handle_temp_view_req/2]).