diff --git a/include/ejabberd_commands.hrl b/include/ejabberd_commands.hrl
index 14d19d2e1..c08ec514b 100644
--- a/include/ejabberd_commands.hrl
+++ b/include/ejabberd_commands.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -type aterm() :: {atom(), atype()}.
 -type atype() :: integer | string | binary | any | atom |
diff --git a/include/ejabberd_http.hrl b/include/ejabberd_http.hrl
index 9e1373ce6..98ee4ee25 100644
--- a/include/ejabberd_http.hrl
+++ b/include/ejabberd_http.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -record(request,
 	{method            :: method(),
diff --git a/include/ejabberd_oauth.hrl b/include/ejabberd_oauth.hrl
index 4798d9070..0b6bbbfe8 100644
--- a/include/ejabberd_oauth.hrl
+++ b/include/ejabberd_oauth.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -record(oauth_token, {
           token = <<"">>           :: binary() | '_',
diff --git a/include/ejabberd_router.hrl b/include/ejabberd_router.hrl
index 060ab79a1..231d92f72 100644
--- a/include/ejabberd_router.hrl
+++ b/include/ejabberd_router.hrl
@@ -1,3 +1,6 @@
+%% @efmt:off
+%% @indent-begin
+
 -define(ROUTES_CACHE, routes_cache).
 
 -type local_hint() :: integer() | {apply, atom(), atom()}.
diff --git a/include/eldap.hrl b/include/eldap.hrl
index 0b6dc97e5..3eb9a7628 100644
--- a/include/eldap.hrl
+++ b/include/eldap.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -define(LDAP_PORT, 389).
 
diff --git a/include/mod_antispam.hrl b/include/mod_antispam.hrl
index c30f24620..7aa512df1 100644
--- a/include/mod_antispam.hrl
+++ b/include/mod_antispam.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -define(MODULE_ANTISPAM, mod_antispam).
 
diff --git a/include/mod_caps.hrl b/include/mod_caps.hrl
index ee1bbe44e..0046b5d79 100644
--- a/include/mod_caps.hrl
+++ b/include/mod_caps.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -record(caps_features,
 	{node_pair = {<<"">>, <<"">>} :: {binary(), binary()},
diff --git a/include/mod_mam.hrl b/include/mod_mam.hrl
index 77ea54a5e..8d9e8e887 100644
--- a/include/mod_mam.hrl
+++ b/include/mod_mam.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -record(archive_msg,
 	{us = {<<"">>, <<"">>}                :: {binary(), binary()},
diff --git a/include/mod_muc_room.hrl b/include/mod_muc_room.hrl
index 1e90a7912..82f777880 100644
--- a/include/mod_muc_room.hrl
+++ b/include/mod_muc_room.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -define(MAX_USERS_DEFAULT, 200).
 
diff --git a/include/mod_offline.hrl b/include/mod_offline.hrl
index e1bb236f6..045eba08b 100644
--- a/include/mod_offline.hrl
+++ b/include/mod_offline.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -record(offline_msg,
 	{us = {<<"">>, <<"">>} :: {binary(), binary()},
diff --git a/include/mod_privacy.hrl b/include/mod_privacy.hrl
index 8118a6de6..2da48552c 100644
--- a/include/mod_privacy.hrl
+++ b/include/mod_privacy.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -record(privacy, {us = {<<"">>, <<"">>} :: {binary(), binary()},
                   default = none        :: none | binary(),
diff --git a/include/mod_push.hrl b/include/mod_push.hrl
index 8a9de102b..f238a42f1 100644
--- a/include/mod_push.hrl
+++ b/include/mod_push.hrl
@@ -16,6 +16,9 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
+
 -record(push_session,
         {us = {<<"">>, <<"">>}                  :: {binary(), binary()},
          timestamp = erlang:timestamp()         :: erlang:timestamp(),
diff --git a/include/mod_roster.hrl b/include/mod_roster.hrl
index a056dd22c..5b807c11d 100644
--- a/include/mod_roster.hrl
+++ b/include/mod_roster.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 -record(roster,
 {
diff --git a/include/mqtt.hrl b/include/mqtt.hrl
index bf910368f..a91e56804 100644
--- a/include/mqtt.hrl
+++ b/include/mqtt.hrl
@@ -15,6 +15,9 @@
 %%% limitations under the License.
 %%%
 %%%-------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
+
 -define(MQTT_VERSION_4, 4).
 -define(MQTT_VERSION_5, 5).
 
diff --git a/include/pubsub.hrl b/include/pubsub.hrl
index 316be342a..593c1175b 100644
--- a/include/pubsub.hrl
+++ b/include/pubsub.hrl
@@ -17,6 +17,8 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
+%% @efmt:off
+%% @indent-begin
 
 %% -------------------------------
 %% Pubsub constants
diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl
index 091e567a8..8656684aa 100644
--- a/src/ejabberd_auth_ldap.erl
+++ b/src/ejabberd_auth_ldap.erl
@@ -44,6 +44,9 @@
 
 -include("eldap.hrl").
 
+%%
+%% @efmt:off
+%% @indent-begin
 -record(state,
 	{host = <<"">>          :: binary(),
          eldap_id = <<"">>      :: binary(),
@@ -61,6 +64,10 @@
          deref_aliases = never  :: never | searching | finding | always,
          dn_filter              :: binary() | undefined,
          dn_filter_attrs = []   :: [binary()]}).
+%% @indent-end
+%% @efmt:on
+%%
+
 
 handle_cast(Msg, State) ->
     ?WARNING_MSG("Unexpected cast: ~p", [Msg]),
diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl
index 8d1dbd595..1e29114bd 100644
--- a/src/ejabberd_bosh.erl
+++ b/src/ejabberd_bosh.erl
@@ -81,6 +81,10 @@
 
 -export_type([bosh_socket/0]).
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(state,
 	{host = <<"">>                            :: binary(),
          sid = <<"">>                             :: binary(),
@@ -109,6 +113,10 @@
          els = []             :: [fxml_stream:xml_stream_el()],
          size = 0             :: non_neg_integer()}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 start(#body{attrs = Attrs} = Body, IP, SID) ->
     XMPPDomain = get_attr(to, Attrs),
     SupervisorProc = gen_mod:get_module_proc(XMPPDomain, mod_bosh),
diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl
index 88bd5e785..6422da520 100644
--- a/src/ejabberd_ctl.erl
+++ b/src/ejabberd_ctl.erl
@@ -774,6 +774,10 @@ print_usage_tags(Tag, MaxC, ShCode, Version) ->
 %% Print usage of 'help' command
 %%-----------------------------
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 print_usage_help(MaxC, ShCode) ->
     LongDesc =
 	["This special ", ?C("help"), " command provides help of ejabberd commands.\n\n"
@@ -812,6 +816,9 @@ print_usage_help(MaxC, ShCode) ->
 	   result = {help, string}},
     print(get_usage_command2("help", C, MaxC, ShCode), []).
 
+%% @indent-end
+%% @efmt:on
+%%
 
 %%-----------------------------
 %% Print usage command
diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
index c14ed2d58..0a7134349 100644
--- a/src/ejabberd_http_ws.erl
+++ b/src/ejabberd_http_ws.erl
@@ -40,6 +40,10 @@
 
 -include("ejabberd_http.hrl").
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(state,
         {socket                       :: ws_socket(),
          ping_interval                :: non_neg_integer(),
@@ -52,7 +56,11 @@
 	 c2s_pid                      :: pid(),
          ws                           :: {#ws{}, pid()}}).
 
-%-define(DBGFSM, true).
+%% @indent-end
+%% @efmt:on
+%%
+
+%%%-define(DBGFSM, true).
 
 -ifdef(DBGFSM).
 
diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
index 789be7359..caa8cfca0 100644
--- a/src/ejabberd_piefxis.erl
+++ b/src/ejabberd_piefxis.erl
@@ -56,12 +56,20 @@
 -define(NS_PIEFXIS, <<"http://www.xmpp.org/extensions/xep-0227.html#ns">>).
 -define(NS_XI, <<"http://www.w3.org/2001/XInclude">>).
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(state, {xml_stream_state :: fxml_stream:xml_stream_state() | undefined,
                 user = <<"">>    :: binary(),
                 server = <<"">>  :: binary(),
                 fd = self()      :: file:io_device(),
                 dir = <<"">>     :: binary()}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 -type state() :: #state{}.
 
 %%File could be large.. we read it in chunks
diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl
index 0c29f039e..bbb0b6765 100644
--- a/src/ejabberd_sql.erl
+++ b/src/ejabberd_sql.erl
@@ -91,6 +91,10 @@
 -include("ejabberd_sql_pt.hrl").
 -include("ejabberd_stacktrace.hrl").
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(state,
 	{db_ref               :: undefined | db_ref_pid() | odbc_connection_reference(),
 	 db_type = odbc       :: pgsql | mysql | sqlite | odbc | mssql,
@@ -101,6 +105,10 @@
 	 overload_reported    :: undefined | integer(),
 	 timeout              :: pos_integer()}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 -define(STATE_KEY, ejabberd_sql_state).
 -define(NESTING_KEY, ejabberd_sql_nesting_level).
 -define(TOP_LEVEL_TXN, 0).
diff --git a/src/ejabberd_update.erl b/src/ejabberd_update.erl
index 6c80fe8e7..ea2be1566 100644
--- a/src/ejabberd_update.erl
+++ b/src/ejabberd_update.erl
@@ -155,6 +155,10 @@ build_script(Dir, UpdatedBeams) ->
     end,
     {Script, LowLevelScript, Check1}.
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 %% Copied from Erlang/OTP file: lib/sasl/src/systools.hrl
 -ifdef(SYSTOOLS_APP_DEF_WITHOUT_OPTIONAL).
 -record(application,
@@ -222,6 +226,9 @@ build_script(Dir, UpdatedBeams) ->
 	}).
 -endif.
 
+%% @indent-end
+%% @efmt:on
+%%
 
 make_script(UpdatedBeams) ->
     lists:map(
diff --git a/src/eldap.erl b/src/eldap.erl
index 3676bd09a..a0a2a5422 100644
--- a/src/eldap.erl
+++ b/src/eldap.erl
@@ -122,6 +122,10 @@
 
 -type handle() :: pid() | atom() | binary().
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(eldap,
 	{version = ?LDAP_VERSION :: non_neg_integer(),
          hosts = []              :: [binary()],
@@ -142,6 +146,10 @@
 	 dict = dict:new()       :: dict:dict(),
          req_q = queue:new()     :: queue:queue()}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 %%%----------------------------------------------------------------------
 %%% API
 %%%----------------------------------------------------------------------
diff --git a/src/mod_antispam.erl b/src/mod_antispam.erl
index b2e7c5937..e07fb2197 100644
--- a/src/mod_antispam.erl
+++ b/src/mod_antispam.erl
@@ -71,6 +71,10 @@
 
 -include_lib("xmpp/include/xmpp.hrl").
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(state,
 	{host = <<>>			:: binary(),
 	 dump_fd = undefined		:: file:io_device() | undefined,
@@ -86,6 +90,10 @@
 	 whitelist_domains = #{}	:: #{binary() => false}
 	}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 -type state() :: #state{}.
 
 -define(COMMAND_TIMEOUT, timer:seconds(30)).
diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
index faa085811..dfa194525 100644
--- a/src/mod_http_upload.erl
+++ b/src/mod_http_upload.erl
@@ -91,6 +91,10 @@
 -include("logger.hrl").
 -include("translate.hrl").
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(state,
 	{server_host = <<>>     :: binary(),
 	 hosts = []             :: [binary()],
@@ -116,6 +120,10 @@
 	 height :: integer(),
 	 width  :: integer()}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 -type state() :: #state{}.
 -type slot() :: [binary(), ...].
 -type slots() :: #{slot() => {pos_integer(), reference()}}.
diff --git a/src/mod_mqtt_mnesia.erl b/src/mod_mqtt_mnesia.erl
index 5c2902d2b..62437d597 100644
--- a/src/mod_mqtt_mnesia.erl
+++ b/src/mod_mqtt_mnesia.erl
@@ -28,6 +28,10 @@
 -include("logger.hrl").
 -include("mqtt.hrl").
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(mqtt_pub, {topic_server            :: {binary(), binary()},
                    user                    :: binary(),
                    resource                :: binary(),
@@ -50,6 +54,10 @@
 		       pid       :: pid() | '_',
 		       timestamp :: erlang:timestamp() | '_'}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 %%%===================================================================
 %%% API
 %%%===================================================================
diff --git a/src/mod_stun_disco.erl b/src/mod_stun_disco.erl
index c210868e7..61942019e 100644
--- a/src/mod_stun_disco.erl
+++ b/src/mod_stun_disco.erl
@@ -62,6 +62,10 @@
 -type host_or_hash() :: binary() | {hash, binary()}.
 -type service_type() :: stun | stuns | turn | turns | undefined.
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(request,
 	{host       :: binary() | inet:ip_address() | undefined,
 	 port       :: 0..65535 | undefined,
@@ -75,6 +79,10 @@
 	 secret   :: binary(),
 	 ttl      :: non_neg_integer()}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 -type request() :: #request{}.
 -type state() :: #state{}.
 
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index 3ecf39ba1..0d67fb564 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -45,6 +45,10 @@
 
 -define(PROCNAME, ejabberd_mod_vcard_ldap).
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(state,
 	{serverhost = <<"">>        :: binary(),
          myhosts = []               :: [binary()],
@@ -68,6 +72,10 @@
 	 deref_aliases = never      :: never | searching | finding | always,
          matches = 0                :: non_neg_integer()}).
 
+%% @indent-end
+%% @efmt:on
+%%
+
 %%%===================================================================
 %%% API
 %%%===================================================================
diff --git a/src/mqtt_codec.erl b/src/mqtt_codec.erl
index 1ef474dd5..c67adfb12 100644
--- a/src/mqtt_codec.erl
+++ b/src/mqtt_codec.erl
@@ -31,6 +31,10 @@
 -define(MAX_UINT32, 4294967295).
 -define(MAX_VARINT, 268435456).
 
+%%
+%% @efmt:off
+%% @indent-begin
+
 -record(codec_state, {version    :: undefined | mqtt_version(),
                       type       :: undefined | non_neg_integer(),
 		      flags      :: undefined | non_neg_integer(),
@@ -58,6 +62,10 @@
 			{{bad_flag, atom()}, char(), term()} |
 			{{bad_flags, atom()}, char(), char()}.
 
+%% @indent-end
+%% @efmt:on
+%%
+
 -opaque state() :: #codec_state{}.
 -export_type([state/0, error_reason/0]).