diff --git a/whistle_apps/apps/callflow/src/module/cf_conference.erl b/whistle_apps/apps/callflow/src/module/cf_conference.erl
index a2b43d32d98..42994d9ce6d 100644
--- a/whistle_apps/apps/callflow/src/module/cf_conference.erl
+++ b/whistle_apps/apps/callflow/src/module/cf_conference.erl
@@ -8,7 +8,7 @@
 %%%-------------------------------------------------------------------
 -module(cf_conference).
 
--include("./src/callflow.hrl").
+-include("../callflow.hrl").
 
 -export([handle/2]).
 
diff --git a/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl b/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl
index f6f2c66b282..1576e49e1a1 100644
--- a/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl
+++ b/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl
@@ -10,7 +10,7 @@
 
 -export([handle/2]).
 
--include("./src/callflow.hrl").
+-include("../callflow.hrl").
 
 -spec handle(wh_json:object(), whapps_call:call()) -> 'ok'.
 handle(Data, Call) ->
diff --git a/whistle_apps/apps/crossbar/src/crossbar.hrl b/whistle_apps/apps/crossbar/src/crossbar.hrl
index 304c3b116f4..1b376f8c7fe 100644
--- a/whistle_apps/apps/crossbar/src/crossbar.hrl
+++ b/whistle_apps/apps/crossbar/src/crossbar.hrl
@@ -5,7 +5,7 @@
 -include_lib("whistle/include/wh_log.hrl").
 -include_lib("whistle/include/wh_databases.hrl").
 
--include("src/crossbar_types.hrl").
+-include("crossbar_types.hrl").
 
 -define(CONFIG_CAT, <<"crossbar">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_about.erl b/whistle_apps/apps/crossbar/src/modules/cb_about.erl
index 51b4499f623..42116bf80f1 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_about.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_about.erl
@@ -16,7 +16,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl b/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl
index cb6cdcc8ddb..92cd242400c 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl
@@ -23,7 +23,7 @@
 
 -export([is_unique_realm/2]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_acls.erl b/whistle_apps/apps/crossbar/src/modules/cb_acls.erl
index 8fa0cf4c748..6c9bcd00d6f 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_acls.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_acls.erl
@@ -17,7 +17,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 -define(ECALLMGR, <<"ecallmgr">>).
 -define(ECALLMGR_ACLS, <<"acls">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_agents.erl b/whistle_apps/apps/crossbar/src/modules/cb_agents.erl
index 29ee34cfd68..d4f71103a13 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_agents.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_agents.erl
@@ -27,7 +27,7 @@
          ,validate/1, validate/2, validate/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".queues">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl
index 119a554bbb8..68b8d843bcc 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl
@@ -25,7 +25,7 @@
          ,put/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(AGG_VIEW_FILE, <<"views/accounts.json">>).
 -define(AGG_VIEW_API, <<"accounts/listing_by_api">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl b/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl
index 8f37c35cb14..79362a83f37 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl
@@ -20,7 +20,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 -include_lib("braintree/include/braintree.hrl").
 
 -define(CUSTOMER_PATH_TOKEN, <<"customer">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl b/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl
index ac081bdf1f2..b278e80870f 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl
@@ -27,7 +27,7 @@
          ,code_change/3
         ]).
 
--include("./src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 -define(TABLE_ID, 'cb_buckets_mgr').
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl b/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl
index 4fde3b27f0a..acac5019bf1 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl
@@ -19,7 +19,7 @@
          ,delete/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl b/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl
index e50b398ddad..b2d18bf3e6f 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl
@@ -19,7 +19,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".callflows">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl b/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl
index c4730246f04..93ea313a37c 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl
@@ -20,7 +20,7 @@
          ,validate/1, validate/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".cdrs">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl b/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl
index 7bb740af12d..b345a65b168 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl
@@ -26,7 +26,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CONNECT_CALL, <<"connect">>).
 -define(HISTORY, <<"history">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl b/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl
index fa208e22507..c5a823d87e7 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl
@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"conferences/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_configs.erl b/whistle_apps/apps/crossbar/src/modules/cb_configs.erl
index b376dd43677..50eda0ecbd6 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_configs.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_configs.erl
@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl b/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl
index 411bd1f7135..464f21b5f57 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl
@@ -20,7 +20,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"trunkstore/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl b/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl
index fc15b0e0f8f..528002712e4 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl
@@ -17,7 +17,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_devices.erl b/whistle_apps/apps/crossbar/src/modules/cb_devices.erl
index f3d74f2c66a..2141d6915bc 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_devices.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_devices.erl
@@ -27,7 +27,7 @@
          ,get_all_acl_ips/0
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(QUICKCALL_URL, [{<<"devices">>, [_, <<"quickcall">>, _]}
                         ,{?WH_ACCOUNTS_DB, [_]}
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_directories.erl b/whistle_apps/apps/crossbar/src/modules/cb_directories.erl
index 823eb24f388..219b81699f1 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_directories.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_directories.erl
@@ -19,7 +19,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(PVT_FUNS, [fun add_pvt_type/2]).
 -define(CB_LIST, <<"directories/crossbar_listing">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_events.erl b/whistle_apps/apps/crossbar/src/modules/cb_events.erl
index 2c292b6233c..571305daded 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_events.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_events.erl
@@ -46,7 +46,7 @@
          ,delete/1, delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(DEFAULT_USER, <<"events_user">>).
 -define(EVENT_DOC_ID(User), <<"event_sub_", User/binary>>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl b/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl
index 34777dcae6f..c37c6a20629 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl
@@ -35,7 +35,7 @@
 %% gen_listener handler callback
 -export([handle_req/2]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(RESPONDERS, [{?MODULE, [{<<"*">>, <<"*">>}]}]). % all matching event cat/name combos go to here
 -define(BINDINGS, []).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl b/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl
index 5b5bef88db5..bf81fe19193 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl
@@ -21,7 +21,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(OUTGOING, <<"outgoing">>).
 -define(INCOMING, <<"incoming">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl b/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl
index d0317daeb08..825339a4131 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl
@@ -33,7 +33,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".provisioner_templates">>).
 -define(CB_LIST, <<"provisioner_templates/crossbar_listing">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl b/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl
index 3375ec3c7d2..6bca12351f9 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl
@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"global_resources/crossbar_listing">>).
 -define(GLOBAL_RESOURCE_DB, <<"offnet">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_groups.erl b/whistle_apps/apps/crossbar/src/modules/cb_groups.erl
index 616094a0ad7..9e69adbcae7 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_groups.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_groups.erl
@@ -20,7 +20,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"groups/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl b/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl
index 683a306f369..ffbf7a5e3bc 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl
@@ -18,7 +18,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(VIEW_FILE, <<"views/hotdesks.json">>).
 -define(CB_LIST, <<"hotdesks/crossbar_listing">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl
index dce4a0afb6a..a0f2fa67ef5 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl
@@ -20,7 +20,7 @@
          ,put/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(AGG_VIEW_FILE, <<"views/accounts.json">>).
 -define(AGG_VIEW_IP, <<"accounts/listing_by_ip">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_killio.erl b/whistle_apps/apps/crossbar/src/modules/cb_killio.erl
index 4c21f55a8c4..525e0b44237 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_killio.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_killio.erl
@@ -19,7 +19,7 @@
          ,post/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(PVT_TYPE, <<"skel">>).
 -define(PVT_FUNS, [fun add_pvt_type/2]).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl b/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl
index 06648f043fe..524dc4b4228 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl
@@ -19,7 +19,7 @@
 %% Supervisor callbacks
 -export([init/1]).
 
--include("./src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 -define(MAX_TOKENS, whapps_config:get_integer(?CONFIG_CAT, <<"max_bucket_tokens">>, 100)).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_limits.erl b/whistle_apps/apps/crossbar/src/modules/cb_limits.erl
index 04da27f5a75..5939e9f3535 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_limits.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_limits.erl
@@ -17,7 +17,7 @@
          ,reconcile_services/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 -include_lib("whistle/src/wh_json.hrl").
 
 -define(CB_LIST, <<"limits/crossbar_listing">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl b/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl
index f35d0a75bf7..9ad3c8077f9 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl
@@ -33,7 +33,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".provisioner_templates">>).
 -define(CB_LIST, <<"provisioner_templates/crossbar_listing">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl b/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl
index 5b9789ac2e2..45978323870 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl
@@ -20,7 +20,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"local_resources/crossbar_listing">>).
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".local_resources">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_media.erl b/whistle_apps/apps/crossbar/src/modules/cb_media.erl
index 05886a2eb52..6f97a907e2f 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_media.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_media.erl
@@ -23,7 +23,7 @@
          ,delete/2, delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 -define(BIN_DATA, <<"raw">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_menus.erl b/whistle_apps/apps/crossbar/src/modules/cb_menus.erl
index 42373858925..27c488a3704 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_menus.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_menus.erl
@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"menus/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl b/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl
index fe927a24117..54d151f8ca8 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl
@@ -15,7 +15,7 @@
          ,is_superduper_admin/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -spec pass_hashes(ne_binary(), ne_binary()) -> {ne_binary(), ne_binary()}.
 pass_hashes(Username, Password) ->
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl b/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl
index 5b470496977..877b3bace77 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl
@@ -16,7 +16,7 @@
          ,authenticate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl b/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl
index 059ccfdbd27..a7c01d88e39 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl
@@ -16,7 +16,7 @@
          ,authorize/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl b/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl
index b3f4b11bccf..e76cca2461a 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl
@@ -20,7 +20,7 @@
          ,put/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(OB_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".onboard">>).
 -define(DEFAULT_FLOW, "{\"data\": { \"id\": \"~s\" }, \"module\": \"user\", \"children\": { \"_\": { \"data\": { \"id\": \"~s\" }, \"module\": \"voicemail\", \"children\": {}}}}").
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl b/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl
index cfc4df70afb..85efb503ad8 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl
@@ -24,7 +24,7 @@
          ,populate_phone_numbers/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -include_lib("whistle_number_manager/include/wh_number_manager.hrl").
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_queues.erl b/whistle_apps/apps/crossbar/src/modules/cb_queues.erl
index ed1d06c4571..df0a7238b73 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_queues.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_queues.erl
@@ -46,7 +46,7 @@
          ,delete/2, delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".queues">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_rates.erl b/whistle_apps/apps/crossbar/src/modules/cb_rates.erl
index 01dbef349df..84750635bc4 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_rates.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_rates.erl
@@ -18,7 +18,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(PVT_FUNS, [fun add_pvt_type/2]).
 -define(PVT_TYPE, <<"rate">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl b/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl
index 6b959c1ac30..cc5bb1430e9 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl
@@ -15,7 +15,7 @@
          ,lookup_regs/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(MASK_REG_FIELDS, [<<"Account-DB">>, <<"Account-ID">>, <<"App-Name">>
                               ,<<"App-Version">>, <<"Event-Category">>, <<"Event-Name">>
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl b/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl
index 0e19504167a..ea8d180ae96 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl
@@ -18,7 +18,7 @@
          ,validate/1, validate/2, validate/3
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(VALIDATION_PATH_TOKEN, <<"validation">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_servers.erl b/whistle_apps/apps/crossbar/src/modules/cb_servers.erl
index 00f51621fc3..ec896ad7347 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_servers.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_servers.erl
@@ -24,7 +24,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SERVER_CONF, [code:lib_dir(crossbar, priv), "/servers/servers.conf"]).
 -define(SERVER_CONFIG_CATEGORY, <<"crossbar.servers">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl b/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl
index 4e6fe844be4..72169e95f95 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl
@@ -20,7 +20,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"service_plans/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_services.erl b/whistle_apps/apps/crossbar/src/modules/cb_services.erl
index a0cf47a9eef..2e024565690 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_services.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_services.erl
@@ -18,7 +18,7 @@
          ,post/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(PVT_TYPE, <<"service">>).
 -define(PVT_FUNS, [fun add_pvt_type/2]).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl
index f1aec0bce5a..a2e17545aac 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl
@@ -30,7 +30,7 @@
          ,put/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%%===================================================================
 %%% API
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_signup.erl b/whistle_apps/apps/crossbar/src/modules/cb_signup.erl
index b585dfe096d..b0026237252 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_signup.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_signup.erl
@@ -29,7 +29,7 @@
 %% cleanup process
 -export([start_link/0, init_it/0]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SIGNUP_DB, <<"signups">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl b/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl
index ac087e0c6e5..8a656f855cb 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl
@@ -18,7 +18,7 @@
          ,authorize/1
         ]).
 
--include("../../src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 -define(VIEW_SUMMARY, <<"accounts/listing_by_id">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_skels.erl b/whistle_apps/apps/crossbar/src/modules/cb_skels.erl
index 95bd87c0afb..b1682e93be5 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_skels.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_skels.erl
@@ -32,7 +32,7 @@
          ,finish_request/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"skels/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_templates.erl b/whistle_apps/apps/crossbar/src/modules/cb_templates.erl
index 419bfaac4e4..6e2a8bac679 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_templates.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_templates.erl
@@ -20,7 +20,7 @@
          ,account_created/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(DB_PREFIX, "template/").
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl b/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl
index 82387121e32..eef210317fc 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl
@@ -18,7 +18,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"temporal_rules/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl
index b006a15dea4..c5ad4d2c53f 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl
@@ -26,7 +26,7 @@
          ,cleanup_loop/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CHILDSPEC, {?MODULE, {?MODULE, 'start_link', []}
                     ,'permanent', 5000, 'worker', [?MODULE]
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl b/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl
index 7481aa69930..95abc51131b 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl
@@ -14,7 +14,7 @@
          ,validate/1, validate/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 %%-ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl
index 2b8c1abbfda..3e2bdddd7b9 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl
@@ -18,7 +18,7 @@
          ,put/1, put/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(ACCT_MD5_LIST, <<"users/creds_by_md5">>).
 -define(ACCT_SHA1_LIST, <<"users/creds_by_sha">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_users.erl b/whistle_apps/apps/crossbar/src/modules/cb_users.erl
index 4e2b4f03ad4..108f1d12a68 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_users.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_users.erl
@@ -24,7 +24,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl b/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl
index 077c4e934b8..5d507c5db28 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl
@@ -22,7 +22,7 @@
          ,delete/2, delete/4
         ]).
 
--include("../../src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"vmboxes/crossbar_listing">>).
 
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl b/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl
index a8f0abb1559..44d287e8227 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl
@@ -19,7 +19,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(CB_LIST, <<"webhooks/crossbar_listing">>).
 -define(CB_USERS_LIST, <<"webhooks/users_listing">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl b/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl
index c059504b764..a4fcd9a7eff 100644
--- a/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl
+++ b/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl
@@ -22,7 +22,7 @@
          ,delete/1
         ]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -define(WHITELABEL_ID, <<"whitelabel">>).
 -define(LOGO_REQ, <<"logo">>).
diff --git a/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl b/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl
index cb93c7fedb4..cd671281cf1 100644
--- a/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl
+++ b/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl
@@ -12,7 +12,7 @@
 
 -export([build/1]).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -record(contact, {id
                   ,callflow
diff --git a/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl b/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl
index 8316bea6cbd..b7765b23317 100644
--- a/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl
+++ b/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl
@@ -10,7 +10,7 @@
 %%%-------------------------------------------------------------------
 -module(provisioner_util).
 
--include("src/crossbar.hrl").
+-include("../crossbar.hrl").
 
 -export([get_mac_address/1]).
 -export([get_old_mac_address/1]).
diff --git a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl
index 322fbc835fd..e87a51b34b8 100644
--- a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl
+++ b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl
@@ -13,7 +13,7 @@
          ,req_params/1
         ]).
 
--include("./src/kzt.hrl").
+-include("../kzt.hrl").
 
 -spec exec(whapps_call:call(), wh_json:object()) -> usurp_return().
 exec(Call, FlowJObj) ->
diff --git a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl
index 23372fd028e..e0d7ea69e9a 100644
--- a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl
+++ b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl
@@ -10,7 +10,7 @@
 
 -export([exec/3]).
 
--include("./src/kzt.hrl").
+-include("../kzt.hrl").
 
 -spec exec(whapps_call:call(), xml_els(), xml_els()) ->
                   {'ok' | 'stop', whapps_call:call()}.