diff --git a/lib/filehighlight.h b/lib/filehighlight.h
index 5048410d7..b78e90416 100644
--- a/lib/filehighlight.h
+++ b/lib/filehighlight.h
@@ -31,4 +31,5 @@ gboolean mc_fhl_parse_ini_file (mc_fhl_t *);
 void mc_fhl_clear (mc_fhl_t *);
 
 /*** inline functions ****************************************************************************/
-#endif
+
+#endif /* MC__FILEHIGHLIGHT_H */
diff --git a/lib/filehighlight/common.c b/lib/filehighlight/common.c
index 0472fd761..9a335d295 100644
--- a/lib/filehighlight/common.c
+++ b/lib/filehighlight/common.c
@@ -27,7 +27,6 @@
 
 #include <config.h>
 
-
 #include "lib/global.h"
 #include "lib/filehighlight.h"
 #include "internal.h"
@@ -72,7 +71,6 @@ mc_fhl_array_free (mc_fhl_t * fhl)
 mc_fhl_t *
 mc_fhl_new (gboolean need_auto_fill)
 {
-
     mc_fhl_t *fhl;
 
     fhl = g_try_new0 (mc_fhl_t, 1);
diff --git a/lib/filehighlight/get-color.c b/lib/filehighlight/get-color.c
index ec8a0f89e..66f129786 100644
--- a/lib/filehighlight/get-color.c
+++ b/lib/filehighlight/get-color.c
@@ -28,7 +28,6 @@
 #include <config.h>
 #include <string.h>
 
-
 #include "lib/global.h"
 #include "lib/skin.h"
 #include "lib/filehighlight.h"
@@ -43,7 +42,9 @@
 /*** file scope variables ************************************************************************/
 
 /*** file scope functions ************************************************************************/
+
 /* --------------------------------------------------------------------------------------------- */
+
 /*inline functions */
 inline static gboolean
 mc_fhl_is_file (file_entry * fe)
@@ -244,7 +245,6 @@ mc_fhl_get_color_regexp (mc_fhl_filter_t * mc_filter, mc_fhl_t * fhl, file_entry
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-
 int
 mc_fhl_get_color (mc_fhl_t * fhl, file_entry * fe)
 {
diff --git a/lib/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c
index a7bbb9219..7b4235ccc 100644
--- a/lib/filehighlight/ini-file-read.c
+++ b/lib/filehighlight/ini-file-read.c
@@ -125,7 +125,6 @@ mc_fhl_parse_get_regexp (mc_fhl_t * fhl, const gchar * group_name)
     g_ptr_array_add (fhl->filters, (gpointer) mc_filter);
     g_free (regexp);
     return TRUE;
-
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -180,7 +179,6 @@ mc_fhl_parse_get_extensions (mc_fhl_t * fhl, const gchar * group_name)
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-
 gboolean
 mc_fhl_read_ini_file (mc_fhl_t * fhl, const gchar * filename)
 {
@@ -194,7 +192,6 @@ mc_fhl_read_ini_file (mc_fhl_t * fhl, const gchar * filename)
     return (fhl->config != NULL);
 }
 
-
 /* --------------------------------------------------------------------------------------------- */
 
 gboolean
diff --git a/lib/filehighlight/internal.h b/lib/filehighlight/internal.h
index 6c6da56e1..498e59b96 100644
--- a/lib/filehighlight/internal.h
+++ b/lib/filehighlight/internal.h
@@ -49,10 +49,10 @@ typedef struct mc_fhl_filter_struct
 
 /*** declarations of public functions ************************************************************/
 
-
 void mc_fhl_array_free (mc_fhl_t *);
 
 gboolean mc_fhl_init_from_standard_files (mc_fhl_t *);
 
 /*** inline functions ****************************************************************************/
-#endif
+
+#endif /* MC__FILEHIGHLIGHT_INTERNAL_H */
diff --git a/lib/mcconfig.h b/lib/mcconfig.h
index 65fdd3c56..2b545f738 100644
--- a/lib/mcconfig.h
+++ b/lib/mcconfig.h
@@ -22,7 +22,6 @@ extern mc_config_t *mc_panels_config;
 
 /*** declarations of public functions **********************************/
 
-
 /* mcconfig/common.c: */
 
 mc_config_t *mc_config_init (const gchar *);
@@ -40,6 +39,7 @@ gboolean mc_config_save_file (mc_config_t * config, GError ** error);
 
 gboolean mc_config_save_to_file (mc_config_t * config, const gchar * filename, GError ** error);
 
+
 /* mcconfig/get.c: */
 
 gchar **mc_config_get_groups (mc_config_t *, gsize *);
@@ -85,5 +85,4 @@ void mc_config_set_int_list (mc_config_t *, const gchar *, const gchar *, int[],
 
 void mc_config_show_dialog (void);
 
-
 #endif
diff --git a/lib/mcconfig/common.c b/lib/mcconfig/common.c
index ac13f63b9..eb12928e0 100644
--- a/lib/mcconfig/common.c
+++ b/lib/mcconfig/common.c
@@ -163,7 +163,6 @@ mc_config_has_group (mc_config_t * mc_config, const char *group)
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
 gboolean
 mc_config_del_param (mc_config_t * mc_config, const char *group, const gchar * param)
 {
diff --git a/lib/search.h b/lib/search.h
index 5770c646e..ae38518c0 100644
--- a/lib/search.h
+++ b/lib/search.h
@@ -56,7 +56,6 @@ typedef enum
 
 typedef struct mc_search_struct
 {
-
     /* public input data */
 
     /* search in all charsets */
@@ -110,7 +109,6 @@ typedef struct mc_search_struct
     /* error code after search */
     mc_search_error_t error;
     gchar *error_str;
-
 } mc_search_t;
 
 typedef struct mc_search_type_str_struct
diff --git a/lib/search/glob.c b/lib/search/glob.c
index 62ae712b8..255ec675c 100644
--- a/lib/search/glob.c
+++ b/lib/search/glob.c
@@ -27,7 +27,6 @@
 
 #include <config.h>
 
-
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/search.h"
diff --git a/lib/search/lib.c b/lib/search/lib.c
index c205f6fcb..28ae5d86b 100644
--- a/lib/search/lib.c
+++ b/lib/search/lib.c
@@ -94,7 +94,6 @@ gchar *
 mc_search__get_one_symbol (const char *charset, const char *str, gsize str_len,
                            gboolean * just_letters)
 {
-
     gchar *converted_str, *next_char;
 
     gsize tmp_len;
@@ -138,6 +137,7 @@ mc_search__get_one_symbol (const char *charset, const char *str, gsize str_len,
 }
 
 /* --------------------------------------------------------------------------------------------- */
+
 int
 mc_search__get_char (mc_search_t * lc_mc_search, const void *user_data, gsize current_pos)
 {
@@ -151,7 +151,6 @@ mc_search__get_char (mc_search_t * lc_mc_search, const void *user_data, gsize cu
 
 /* --------------------------------------------------------------------------------------------- */
 
-
 GString *
 mc_search__tolower_case_str (const char *charset, const char *str, gsize str_len)
 {
diff --git a/lib/search/regex.c b/lib/search/regex.c
index 77dd4cee5..0631493cb 100644
--- a/lib/search/regex.c
+++ b/lib/search/regex.c
@@ -373,6 +373,7 @@ mc_search_regex__get_token_by_num (const mc_search_t * lc_mc_search, gsize lc_in
 }
 
 /* --------------------------------------------------------------------------------------------- */
+
 static int
 mc_search_regex__process_replace_str (const GString * replace_str, const gsize current_pos,
                                       gsize * skip_len, replace_transform_type_t * replace_flags)
@@ -673,6 +674,7 @@ mc_search__run_regex (mc_search_t * lc_mc_search, const void *user_data,
 }
 
 /* --------------------------------------------------------------------------------------------- */
+
 GString *
 mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str)
 {
diff --git a/lib/search/search.c b/lib/search/search.c
index 30dcdb80a..f605bbde4 100644
--- a/lib/search/search.c
+++ b/lib/search/search.c
@@ -128,8 +128,6 @@ mc_search__conditions_free (GPtrArray * array)
 
 /* --------------------------------------------------------------------------------------------- */
 
-
-
 /*** public functions ****************************************************************************/
 
 mc_search_t *
@@ -263,7 +261,6 @@ mc_search_run (mc_search_t * lc_mc_search, const void *user_data,
     if ((lc_mc_search->conditions == NULL) && !mc_search_prepare (lc_mc_search))
         return FALSE;
 
-
     switch (lc_mc_search->search_type)
     {
     case MC_SEARCH_T_NORMAL:
@@ -418,7 +415,6 @@ mc_search_getstart_result_by_num (mc_search_t * lc_mc_search, int lc_index)
 #else /* SEARCH_TYPE_GLIB */
     return lc_mc_search->iovector[lc_index * 2];
 #endif /* SEARCH_TYPE_GLIB */
-
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -440,7 +436,6 @@ mc_search_getend_result_by_num (mc_search_t * lc_mc_search, int lc_index)
 #else /* SEARCH_TYPE_GLIB */
     return lc_mc_search->iovector[lc_index * 2 + 1];
 #endif /* SEARCH_TYPE_GLIB */
-
 }
 
 /* --------------------------------------------------------------------------------------------- */
diff --git a/lib/skin/colors.c b/lib/skin/colors.c
index be8993df0..d32ba4adb 100644
--- a/lib/skin/colors.c
+++ b/lib/skin/colors.c
@@ -81,6 +81,7 @@ mc_skin_color_remove_from_hash (mc_skin_t * mc_skin, const gchar * group, const
     g_hash_table_remove (mc_skin->colors, (gpointer) kname);
 }
 #endif
+
 /* --------------------------------------------------------------------------------------------- */
 
 static void
diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c
index 2e830cf46..fb3f7e923 100644
--- a/lib/skin/hc-skins.c
+++ b/lib/skin/hc-skins.c
@@ -29,7 +29,6 @@
 
 #include "internal.h"
 
-
 /*** global variables ****************************************************************************/
 
 /*** file scope macro definitions ****************************************************************/
diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c
index da75f6fcc..bdb60f368 100644
--- a/lib/skin/ini-file.c
+++ b/lib/skin/ini-file.c
@@ -33,7 +33,6 @@
 
 #include "src/main.h"
 
-
 /*** global variables ****************************************************************************/
 
 /*** file scope macro definitions ****************************************************************/
@@ -43,6 +42,7 @@
 /*** file scope variables ************************************************************************/
 
 /*** file scope functions ************************************************************************/
+
 /* --------------------------------------------------------------------------------------------- */
 
 static gboolean
diff --git a/lib/skin/internal.h b/lib/skin/internal.h
index a75ef90ea..d428a0e83 100644
--- a/lib/skin/internal.h
+++ b/lib/skin/internal.h
@@ -37,4 +37,5 @@ void mc_skin_hardcoded_blackwhite_colors (mc_skin_t *);
 void mc_skin_colors_old_configure (mc_skin_t *);
 
 /*** inline functions ****************************************************************************/
-#endif
+
+#endif /* MC__SKIN_INTERNAL_H */
diff --git a/lib/skin/lines.c b/lib/skin/lines.c
index 13138cd33..da043ab6b 100644
--- a/lib/skin/lines.c
+++ b/lib/skin/lines.c
@@ -33,8 +33,6 @@
 
 #include "src/args.h"
 
-
-
 /*** global variables ****************************************************************************/
 
 /*** file scope macro definitions ****************************************************************/
diff --git a/lib/strutil.h b/lib/strutil.h
index 6412591af..06cebcee6 100644
--- a/lib/strutil.h
+++ b/lib/strutil.h
@@ -80,7 +80,6 @@ typedef enum
     J_CENTER_LEFT_FIT = 0x14
 } align_crt_t;
 
-
 /*** structures declarations (and typedefs of structures)*****************************************/
 
 /* all functions in str_class must be defined for every encoding */
diff --git a/lib/strutil/strescape.c b/lib/strutil/strescape.c
index 9854f3346..281eb5a7d 100644
--- a/lib/strutil/strescape.c
+++ b/lib/strutil/strescape.c
@@ -26,8 +26,8 @@
  */
 
 #include <config.h>
-#include "lib/strescape.h"
 
+#include "lib/strescape.h"
 
 /*** global variables ****************************************************************************/
 
@@ -244,5 +244,4 @@ strutils_is_char_escaped (const char *start, const char *current)
     return (gboolean) num_esc % 2;
 }
 
-
 /* --------------------------------------------------------------------------------------------- */