diff --git a/lib/ejabberd/config/ejabberd_module.ex b/lib/ejabberd/config/ejabberd_module.ex
index 57fd8303c..2d413ab56 100644
--- a/lib/ejabberd/config/ejabberd_module.ex
+++ b/lib/ejabberd/config/ejabberd_module.ex
@@ -7,12 +7,13 @@ defmodule Ejabberd.Config.EjabberdModule do
   the already existing Elixir.Module.
   """
 
-  @type t :: %{module: atom, attrs: [Attr.t]}
-
-  defstruct [:module, :attrs]
-
   alias Ejabberd.Config.EjabberdModule
   alias Ejabberd.Config.Validation
+  alias Ejabberd.Config.Attr
+
+  @type t :: %{module: atom, attrs: [Attr.attr]}
+
+  defstruct [:module, :attrs]
 
   @doc """
   Given a list of modules / single module
diff --git a/lib/ejabberd/config/validator/validation.ex b/lib/ejabberd/config/validator/validation.ex
index af582676e..227a3545f 100644
--- a/lib/ejabberd/config/validator/validation.ex
+++ b/lib/ejabberd/config/validator/validation.ex
@@ -3,12 +3,12 @@ defmodule Ejabberd.Config.Validation do
   Module used to validate a list of modules.
   """
 
-  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
-  @type mod_validation_result :: {:ok, EjabberdModule.t} | {:error, EjabberdModule.t, map}
-
   alias Ejabberd.Config.EjabberdModule
   alias Ejabberd.Config.Validator
 
+  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
+  @type mod_validation_result :: {:ok, EjabberdModule.t} | {:error, EjabberdModule.t, map}
+
   @doc """
   Given a module or a list of modules it runs validators on them
   and returns {:ok, mod} or {:error, mod, errors}, for each
diff --git a/lib/ejabberd/config/validator/validator_attrs.ex b/lib/ejabberd/config/validator/validator_attrs.ex
index 6a85c068d..bdce4f679 100644
--- a/lib/ejabberd/config/validator/validator_attrs.ex
+++ b/lib/ejabberd/config/validator/validator_attrs.ex
@@ -3,11 +3,12 @@ defmodule Ejabberd.Config.Validator.Attrs do
   Validator module used to validate attributes.
   """
 
-  # TODO: Duplicated from validator.ex !!!
-  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
-
   import Ejabberd.Config.ValidatorUtility
   alias Ejabberd.Config.Attr
+  alias Ejabberd.Config.EjabberdModule
+
+  # TODO: Duplicated from validator.ex !!!
+  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
 
   @doc """
   Given a module (with the form used for validation)
diff --git a/lib/ejabberd/config/validator/validator_dependencies.ex b/lib/ejabberd/config/validator/validator_dependencies.ex
index d44c8a136..4eb466663 100644
--- a/lib/ejabberd/config/validator/validator_dependencies.ex
+++ b/lib/ejabberd/config/validator/validator_dependencies.ex
@@ -4,6 +4,8 @@ defmodule Ejabberd.Config.Validator.Dependencies do
   with the @dependency annotation.
   """
 
+  alias Ejabberd.Config.EjabberdModule
+
   # TODO: Duplicated from validator.ex !!!
   @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
   import Ejabberd.Config.ValidatorUtility