Code clean up

src/encoding.h

@@ -20,8 +20,6 @@
 #ifndef _ENCODING_H
 #define _ENCODING_H
 
-#include <glib.h> // TODO: ?????  It must to -> .c
-
 enum {
 	IANA = 0,
 	OPENI18N,

src/file.c

@@ -17,6 +17,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <glib/gprintf.h>
 #include <stdio.h>
 #include <string.h>
 #include "l3afpad.h"

src/file.h

@@ -32,8 +32,6 @@ gchar *get_file_basename(gchar *filename, gboolean bracket);
 gchar *parse_file_uri(gchar *uri);
 gint file_open_real(GtkWidget *view, FileInfo *fi);
 gint file_save_real(GtkWidget *view, FileInfo *fi);
-#if ENABLE_STATISTICS
 gchar *file_stats(GtkWidget *view, FileInfo *fi);
-#endif
 
 #endif /* _FILE_H */

src/l3afpad.h

@@ -25,6 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 #ifndef ENABLE_PRINT
@@ -60,9 +61,7 @@
 #include "dnd.h"
 #include "utils.h"
 #include "emacs.h"
-#if ENABLE_PRINT
 #include "gtkprint.h"
-#endif
 #include <gdk/gdkkeysyms-compat.h>
 
 #define gtk_check_menu_item_get_active gtk_toggle_action_get_active

src/utils.h

@@ -20,13 +20,9 @@
 #ifndef _UTILS_H
 #define _UTILS_H
 
-#ifdef G_OS_UNIX
 gchar *gedit_utils_get_stdin(void);
-#endif
 GtkWidget *create_button_with_stock_image(const gchar *text, const gchar *stock_id);
-#if SEARCH_HISTORY
 void update_combo_data(GtkWidget *entry, GList **history);
 GtkWidget *create_combo_with_history(GList **history);
-#endif
 
 #endif /* _UTILS_H */