GNOME.org
 

[easytag] Remove many unnecessary include directives

commit 1dc1732e26b93a3ee792f13d0faaf18652ea4a71
Author: David King <amigadave amigadave com>
Date:   Tue Dec 16 20:25:25 2014 +0000

    Remove many unnecessary include directives

 src/about.c                   |   33 ++++++++++++++++-----------------
 src/application.c             |    6 +++---
 src/application.h             |    1 -
 src/application_window.c      |    1 -
 src/browser.c                 |    3 +--
 src/browser.h                 |    4 ++--
 src/cddb_dialog.c             |    5 ++---
 src/charset.c                 |    3 ---
 src/easytag.c                 |   34 ++++------------------------------
 src/easytag.h                 |   11 ++++-------
 src/et_core.c                 |   12 +++++-------
 src/et_core.h                 |    2 --
 src/log.c                     |    7 +------
 src/misc.c                    |    8 ++------
 src/picture.c                 |   27 ++++-----------------------
 src/picture.h                 |   37 ++++++++++++++-----------------------
 src/preferences_dialog.c      |    4 ----
 src/scan_dialog.c             |    2 --
 src/setting.c                 |    3 ---
 src/status_bar.c              |    3 ++-
 src/tag_area.c                |    5 ++---
 src/tags/ape_tag.c            |    5 +----
 src/tags/flac_header.c        |    1 -
 src/tags/flac_tag.c           |    5 -----
 src/tags/id3_tag.c            |   11 +++--------
 src/tags/id3v24_tag.c         |    6 +-----
 src/tags/monkeyaudio_header.c |    1 -
 src/tags/mp4_tag.cc           |    1 -
 src/tags/mpeg_header.c        |    1 -
 src/tags/musepack_header.c    |    1 -
 src/tags/ogg_header.c         |    1 -
 src/tags/ogg_header.h         |    3 +--
 src/tags/ogg_tag.c            |    5 -----
 src/tags/opus_header.c        |    2 --
 src/tags/opus_tag.c           |    5 -----
 src/tags/vcedit.c             |    2 --
 src/tags/vcedit.h             |    3 ++-
 src/tags/wavpack_header.c     |    1 -
 src/tags/wavpack_tag.c        |    4 ----
 39 files changed, 70 insertions(+), 199 deletions(-)
---
diff --git a/src/about.c b/src/about.c
index 6cd010d..360beca 100644
--- a/src/about.c
+++ b/src/about.c
@@ -1,29 +1,28 @@
-/* about.c - 2000/05/05 */
-/*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
- *  Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014  David King <amigadave amigadave com>
+ * Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include "config.h"
 
-#include <gtk/gtk.h>
+#include "about.h"
+
 #include <glib/gi18n.h>
 
-#include "about.h"
 #include "easytag.h"
 
 void
diff --git a/src/application.c b/src/application.c
index 7476fd6..89bd624 100644
--- a/src/application.c
+++ b/src/application.c
@@ -20,15 +20,15 @@
 
 #include "application.h"
 
+#include <glib/gi18n.h>
+#include <stdlib.h>
+
 #include "about.h"
 #include "charset.h"
 #include "easytag.h"
 #include "log.h"
 #include "misc.h"
 
-#include <glib/gi18n.h>
-#include <stdlib.h>
-
 /* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
 G_DEFINE_TYPE (EtApplication, et_application, GTK_TYPE_APPLICATION)
 
diff --git a/src/application.h b/src/application.h
index 5195907..3a7f5cd 100644
--- a/src/application.h
+++ b/src/application.h
@@ -19,7 +19,6 @@
 #ifndef ET_APPLICATION_H_
 #define ET_APPLICATION_H_
 
-#include <gio/gio.h>
 #include <gtk/gtk.h>
 
 #include "application_window.h"
diff --git a/src/application_window.c b/src/application_window.c
index 3d2a424..88ba713 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -20,7 +20,6 @@
 
 #include "application_window.h"
 
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
 #include "browser.h"
diff --git a/src/browser.c b/src/browser.c
index 19eb418..96606ee 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -28,11 +28,9 @@
 
 #include "browser.h"
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include <glib/gi18n.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <dirent.h>
 #include <string.h>
@@ -4385,6 +4383,7 @@ Rename_Directory (EtBrowser *self)
     new_path = g_strconcat(directory_parent, directory_new_name_file, NULL);
     new_path_utf8 = filename_to_display(new_path);
 
+    /* TODO: Replace with g_open_dir() (or more likely g_file_move()). */
     /* Check if the new directory name doesn't already exists, and detect if
      * it's only a case change (needed for vfat) */
     if ( (dir=opendir(new_path))!=NULL )
diff --git a/src/browser.h b/src/browser.h
index f9fa977..92cf503 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -21,12 +21,12 @@
 #ifndef ET_BROWSER_H_
 #define ET_BROWSER_H_
 
-#include "et_core.h"
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
+#include "et_core.h"
+
 #define ET_TYPE_BROWSER (et_browser_get_type ())
 #define ET_BROWSER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ET_TYPE_BROWSER, EtBrowser))
 
diff --git a/src/cddb_dialog.c b/src/cddb_dialog.c
index eaf6ff4..a09e071 100644
--- a/src/cddb_dialog.c
+++ b/src/cddb_dialog.c
@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
+#include "cddb_dialog.h"
+
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -39,7 +39,6 @@
 #include <errno.h>
 
 #include "application_window.h"
-#include "cddb_dialog.h"
 #include "easytag.h"
 #include "enums.h"
 #include "et_core.h"
diff --git a/src/charset.c b/src/charset.c
index 661b625..4ad9c77 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -25,9 +25,6 @@
 #include "charset.h"
 
 #include <stdlib.h>
-#include <glib.h>
-#include <string.h>
-#include <errno.h>
 #include <glib/gi18n.h>
 
 #ifdef HAVE_LANGINFO_CODESET
diff --git a/src/easytag.c b/src/easytag.c
index 8a90ea5..67b4a4e 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -17,46 +17,28 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "config.h" // For definition of ENABLE_OGG
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
+#include "config.h"
+
+#include "easytag.h"
+
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
-#ifdef ENABLE_MP3
-#include <id3tag.h>
-#endif
-#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
-#include <id3.h>
-#endif
 #include <sys/types.h>
 
-#include "easytag.h"
 #include "application_window.h"
 #include "browser.h"
 #include "log.h"
 #include "misc.h"
 #include "cddb_dialog.h"
-#include "preferences_dialog.h"
 #include "setting.h"
 #include "scan_dialog.h"
-#include "mpeg_header.h"
-#include "id3_tag.h"
-#include "ogg_tag.h"
 #include "et_core.h"
-#include "picture.h"
 #include "charset.h"
 
 #include "win32/win32dep.h"
 
-
-/****************
- * Declarations *
- ****************/
 static GtkWidget *QuitRecursionWindow = NULL;
 
 /* Used to force to hide the msgbox when saving tag */
@@ -68,14 +50,6 @@ static gboolean SF_HideMsgbox_Rename_File;
 /* To remember which button was pressed when renaming file */
 static gint SF_ButtonPressed_Rename_File;
 
-#ifdef ENABLE_FLAC
-    #include <FLAC/metadata.h>
-#endif
-
-
-/**************
- * Prototypes *
- **************/
 static gboolean Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox);
 static gint Save_File (ET_File *ETFile, gboolean multiple_files,
                        gboolean force_saving_files);
diff --git a/src/easytag.h b/src/easytag.h
index cae28ad..2047657 100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -1,4 +1,3 @@
-/* easytag.h - 2000/04/28 */
 /*
  *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
  *  Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
@@ -19,19 +18,17 @@
  */
 
 
-#ifndef __EASYTAG_H__
-#define __EASYTAG_H__
+#ifndef ET_EASYTAG_H_
+#define ET_EASYTAG_H_
 
-
-/* 'include' and 'define' created by autoconf/automake */
 #include "config.h"
 
-#include "et_core.h"
+#include <gtk/gtk.h>
 
+#include "et_core.h"
 
 #define MAX_STRING_LEN     1024
 
-
 /***************
  * Declaration *
  ***************/
diff --git a/src/et_core.c b/src/et_core.c
index a07b0f9..9143924 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -17,7 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "et_core.h"
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
@@ -27,13 +29,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>
-#include <ctype.h>
-#include <locale.h>
-#include <errno.h>
 
 #include "application_window.h"
 #include "easytag.h"
-#include "et_core.h"
 #include "mpeg_header.h"
 #include "monkeyaudio_header.h"
 #include "musepack_header.h"
@@ -3394,9 +3392,9 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
 
         FileTag->track = et_track_number_to_string (atoi (FileTagCur->track));
 
-        // This field must contain only digits
+        /* This field must contain only digits. */
         tmp_str = FileTag->track;
-        while (isdigit((guchar)*tmp_str)) tmp_str++;
+        while (g_ascii_isdigit (*tmp_str)) tmp_str++;
             *tmp_str = 0;
         g_strstrip (FileTag->track);
     } else
diff --git a/src/et_core.h b/src/et_core.h
index 3feaecb..af52c39 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -20,8 +20,6 @@
 #ifndef ET_CORE_H_
 #define ET_CORE_H_
 
-#include "config.h" /* For definition of ENABLE_OGG and so on. */
-
 #include "setting.h"
 
 #include <glib.h>
diff --git a/src/log.c b/src/log.c
index bc8c7fa..67a3fa8 100644
--- a/src/log.c
+++ b/src/log.c
@@ -17,16 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <glib/gi18n.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "log.h"
 #include "application_window.h"
diff --git a/src/misc.c b/src/misc.c
index 7e3043e..c76cd2f 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -19,14 +19,10 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
+#include "misc.h"
+
 #include <glib/gi18n.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <errno.h>
 
-#include "misc.h"
 #include "easytag.h"
 #include "id3_tag.h"
 #include "browser.h"
diff --git a/src/picture.c b/src/picture.c
index c5164fb..6a64d6f 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -17,20 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "picture.h"
+
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdk.h>
 #include <glib/gi18n.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
 
-#include "picture.h"
 #include "easytag.h"
 #include "log.h"
 #include "misc.h"
@@ -39,14 +32,6 @@
 
 #include "win32/win32dep.h"
 
-
-/**************
- * Prototypes *
- **************/
-
-static const gchar *Picture_Format_String (Picture_Format format);
-
-
 /*
  * Note :
  * -> MP4_TAG :
@@ -55,10 +40,6 @@ static const gchar *Picture_Format_String (Picture_Format format);
  *
  */
 
-/*************
- * Functions *
- *************/
-
 /*
  * et_picture_type_from_filename:
  * @filename: UTF-8 representation of a filename
diff --git a/src/picture.h b/src/picture.h
index 0bc680b..2363dfc 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -1,21 +1,20 @@
-/* picture.h - 2004/11/21 */
-/*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
- *  Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014  David King <amigadave amigadave com>
+ * Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #ifndef ET_PICTURE_H_
@@ -25,10 +24,6 @@
 
 G_BEGIN_DECLS
 
-/***************
- * Declaration *
- ***************/
-
 /* Defined in et_core.h
 typedef struct _Picture Picture;
 struct _Picture
@@ -78,10 +73,6 @@ typedef enum
     PICTURE_FORMAT_UNKNOWN
 } Picture_Format;
 
-/**************
- * Prototypes *
- **************/
-
 Picture       *Picture_Allocate         (void);
 Picture       *Picture_Copy_One         (const Picture *pic);
 Picture       *Picture_Copy             (const Picture *pic);
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index c6fa43b..3edc490 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -22,13 +22,9 @@
 #include "preferences_dialog.h"
 
 #include <errno.h>
-#include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include "application_window.h"
 #include "setting.h"
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index cf964ba..ecdb726 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -21,11 +21,9 @@
 
 #include "scan_dialog.h"
 
-#include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
-#include <config.h>
 #include <glib/gi18n.h>
 
 #include "application_window.h"
diff --git a/src/setting.c b/src/setting.c
index ebf98c7..9592dc8 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -19,14 +19,11 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <dirent.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/src/status_bar.c b/src/status_bar.c
index 3e7e4d0..a9be060 100644
--- a/src/status_bar.c
+++ b/src/status_bar.c
@@ -19,9 +19,10 @@
 
 #include "config.h"
 
+#include "status_bar.h"
+
 #include <glib/gi18n.h>
 
-#include "status_bar.h"
 #include "charset.h"
 
 /* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
diff --git a/src/tag_area.c b/src/tag_area.c
index 4be465e..30c2dfb 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -20,7 +20,6 @@
 
 #include "tag_area.h"
 
-#include <ctype.h>
 #include <glib/gi18n.h>
 
 #include "application_window.h"
@@ -1074,7 +1073,7 @@ Insert_Only_Digit (GtkEditable *editable,
     if (length<=0 || !inserted_text)
         return;
 
-    if (!isdigit((guchar)inserted_text[0]) && inserted_text[0] != '-')
+    if (!g_ascii_isdigit (inserted_text[0]) && inserted_text[0] != '-')
     {
         g_signal_stop_emission_by_name(G_OBJECT(editable),"insert_text");
         return;
@@ -1091,7 +1090,7 @@ Insert_Only_Digit (GtkEditable *editable,
     // Check the rest, if any...
     for (i = 1; i < length; i++)
     {
-        if (isdigit((guchar)inserted_text[i]))
+        if (g_ascii_isdigit (inserted_text[i]))
         {
             result[j++] = inserted_text[i];
         }
diff --git a/src/tags/ape_tag.c b/src/tags/ape_tag.c
index d96d647..7e377a6 100644
--- a/src/tags/ape_tag.c
+++ b/src/tags/ape_tag.c
@@ -18,15 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "easytag.h"
 #include "ape_tag.h"
diff --git a/src/tags/flac_header.c b/src/tags/flac_header.c
index 8750f89..ff08068 100644
--- a/src/tags/flac_header.c
+++ b/src/tags/flac_header.c
@@ -21,7 +21,6 @@
 
 #ifdef ENABLE_FLAC
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <errno.h>
 
diff --git a/src/tags/flac_tag.c b/src/tags/flac_tag.c
index 6672796..e659210 100644
--- a/src/tags/flac_tag.c
+++ b/src/tags/flac_tag.c
@@ -22,13 +22,8 @@
 
 #ifdef ENABLE_FLAC
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "easytag.h"
 #include "flac_private.h"
diff --git a/src/tags/id3_tag.c b/src/tags/id3_tag.c
index a61f938..7300600 100644
--- a/src/tags/id3_tag.c
+++ b/src/tags/id3_tag.c
@@ -19,19 +19,14 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
-#include <errno.h>
 #include <string.h>
-#include <ctype.h>
-#include <unistd.h>
+#include <errno.h>
 
 #include "id3_tag.h"
 #include "ape_tag.h"
 #include "picture.h"
 #include "easytag.h"
-#include "browser.h"
 #include "genres.h"
 #include "setting.h"
 #include "misc.h"
@@ -101,7 +96,7 @@ et_id3tag_get_tpos_from_file_tag (const File_Tag *FileTag)
 
     while (*p)
     {
-        if (!isdigit (*p))
+        if (!g_ascii_isdigit (*p))
         {
             break;
         }
@@ -117,7 +112,7 @@ et_id3tag_get_tpos_from_file_tag (const File_Tag *FileTag)
 
         while (*p)
         {
-            if (!isdigit (*p))
+            if (!g_ascii_isdigit (*p))
             {
                 break;
             }
diff --git a/src/tags/id3v24_tag.c b/src/tags/id3v24_tag.c
index c142c4a..a6b4dca 100644
--- a/src/tags/id3v24_tag.c
+++ b/src/tags/id3v24_tag.c
@@ -18,18 +18,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <ctype.h>
 #include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
 
 #include "id3_tag.h"
 #include "picture.h"
diff --git a/src/tags/monkeyaudio_header.c b/src/tags/monkeyaudio_header.c
index 2a00820..e7671e1 100644
--- a/src/tags/monkeyaudio_header.c
+++ b/src/tags/monkeyaudio_header.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "et_core.h"
diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
index bc2a1b4..f03a2d2 100644
--- a/src/tags/mp4_tag.cc
+++ b/src/tags/mp4_tag.cc
@@ -23,7 +23,6 @@
 
 #ifdef ENABLE_MP4
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "mp4_header.h"
diff --git a/src/tags/mpeg_header.c b/src/tags/mpeg_header.c
index 2913b53..159b526 100644
--- a/src/tags/mpeg_header.c
+++ b/src/tags/mpeg_header.c
@@ -21,7 +21,6 @@
 
 #if defined ENABLE_MP3 && defined ENABLE_ID3LIB
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <errno.h>
 
diff --git a/src/tags/musepack_header.c b/src/tags/musepack_header.c
index a696eda..9cf7481 100644
--- a/src/tags/musepack_header.c
+++ b/src/tags/musepack_header.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "et_core.h"
diff --git a/src/tags/ogg_header.c b/src/tags/ogg_header.c
index 44545c4..c7190e3 100644
--- a/src/tags/ogg_header.c
+++ b/src/tags/ogg_header.c
@@ -21,7 +21,6 @@
 
 #ifdef ENABLE_OGG
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <errno.h>
 #include <vorbis/codec.h>
diff --git a/src/tags/ogg_header.h b/src/tags/ogg_header.h
index 533eea7..a0a5698 100644
--- a/src/tags/ogg_header.h
+++ b/src/tags/ogg_header.h
@@ -21,8 +21,7 @@
 #ifndef ET_OGG_HEADER_H_
 #define ET_OGG_HEADER_H_
 
-
-#include <glib.h>
+#include <gio/gio.h>
 #include "et_core.h"
 
 G_BEGIN_DECLS
diff --git a/src/tags/ogg_tag.c b/src/tags/ogg_tag.c
index bb3b281..2bdcbce 100644
--- a/src/tags/ogg_tag.c
+++ b/src/tags/ogg_tag.c
@@ -21,15 +21,10 @@
 
 #ifdef ENABLE_OGG
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <vorbis/codec.h>
-#include <vorbis/vorbisfile.h>
-#include <unistd.h>
 
 #include "easytag.h"
 #include "ogg_tag.h"
diff --git a/src/tags/opus_header.c b/src/tags/opus_header.c
index 9eaa8aa..e4a95c0 100644
--- a/src/tags/opus_header.c
+++ b/src/tags/opus_header.c
@@ -20,9 +20,7 @@
 
 #ifdef ENABLE_OPUS
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <errno.h>
 
 #include "easytag.h"
 #include "opus_header.h"
diff --git a/src/tags/opus_tag.c b/src/tags/opus_tag.c
index 9cedd2c..1e104e8 100644
--- a/src/tags/opus_tag.c
+++ b/src/tags/opus_tag.c
@@ -22,11 +22,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
 #include <opus/opus.h>
 #include <vorbis/codec.h>
 
diff --git a/src/tags/vcedit.c b/src/tags/vcedit.c
index 452ff8c..7c76dc4 100644
--- a/src/tags/vcedit.c
+++ b/src/tags/vcedit.c
@@ -22,8 +22,6 @@
 #ifdef ENABLE_OGG
 #include <gio/gio.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
diff --git a/src/tags/vcedit.h b/src/tags/vcedit.h
index 64f887b..9e097eb 100644
--- a/src/tags/vcedit.h
+++ b/src/tags/vcedit.h
@@ -24,9 +24,10 @@
 
 #ifdef ENABLE_OGG
 
+#include <gio/gio.h>
+
 G_BEGIN_DECLS
 
-#include <stdio.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 
diff --git a/src/tags/wavpack_header.c b/src/tags/wavpack_header.c
index e90102a..fe887a1 100644
--- a/src/tags/wavpack_header.c
+++ b/src/tags/wavpack_header.c
@@ -21,7 +21,6 @@
 
 #ifdef ENABLE_WAVPACK
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <wavpack/wavpack.h>
 
diff --git a/src/tags/wavpack_tag.c b/src/tags/wavpack_tag.c
index f9a81aa..b0ffa4b 100644
--- a/src/tags/wavpack_tag.c
+++ b/src/tags/wavpack_tag.c
@@ -22,13 +22,9 @@
 
 #ifdef ENABLE_WAVPACK
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <unistd.h>
 #include <wavpack/wavpack.h>
 
 #include "easytag.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]