diff options
70 files changed, 79 insertions, 36 deletions
diff --git a/plugins/gvnc/gvnc_plugin.c b/plugins/gvnc/gvnc_plugin.c index 23567926b..5493584da 100644 --- a/plugins/gvnc/gvnc_plugin.c +++ b/plugins/gvnc/gvnc_plugin.c @@ -77,7 +77,6 @@ enum { static RemminaPluginService *remmina_plugin_service = NULL; -#define REMMINA_PLUGIN_DEBUG(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ## __VA_ARGS__) gchar* str_replace(const gchar *string, const gchar *search, const gchar *replacement) { diff --git a/plugins/python_wrapper/python_wrapper_entry.c b/plugins/python_wrapper/python_wrapper_entry.c index 53b9a6755..302250871 100644 --- a/plugins/python_wrapper/python_wrapper_entry.c +++ b/plugins/python_wrapper/python_wrapper_entry.c @@ -42,7 +42,6 @@ // I N C L U D E S //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#include "python_wrapper_common.h" #include "python_wrapper_entry.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_entry.h b/plugins/python_wrapper/python_wrapper_entry.h index 5dc356184..b7e4d5b35 100644 --- a/plugins/python_wrapper/python_wrapper_entry.h +++ b/plugins/python_wrapper/python_wrapper_entry.h @@ -39,6 +39,8 @@ #pragma once +#include "python_wrapper_common.h" + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // A P I //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_file.h b/plugins/python_wrapper/python_wrapper_file.h index c8d25fa34..8bf48dfa6 100644 --- a/plugins/python_wrapper/python_wrapper_file.h +++ b/plugins/python_wrapper/python_wrapper_file.h @@ -39,6 +39,8 @@ #pragma once +#include "python_wrapper_common.h" + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // A P I //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_pref.h b/plugins/python_wrapper/python_wrapper_pref.h index 40855367e..f36e82428 100644 --- a/plugins/python_wrapper/python_wrapper_pref.h +++ b/plugins/python_wrapper/python_wrapper_pref.h @@ -39,6 +39,8 @@ #pragma once +#include "python_wrapper_common.h" + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // A P I //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_protocol.h b/plugins/python_wrapper/python_wrapper_protocol.h index 0e0db676c..ffa35c96a 100644 --- a/plugins/python_wrapper/python_wrapper_protocol.h +++ b/plugins/python_wrapper/python_wrapper_protocol.h @@ -39,6 +39,8 @@ #pragma once +#include "python_wrapper_common.h" + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // I N C L U D E S //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_protocol_widget.h b/plugins/python_wrapper/python_wrapper_protocol_widget.h index b6a9c8ed1..169fab328 100644 --- a/plugins/python_wrapper/python_wrapper_protocol_widget.h +++ b/plugins/python_wrapper/python_wrapper_protocol_widget.h @@ -39,6 +39,8 @@ #pragma once +#include "python_wrapper_common.h" + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // A P I //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_remmina.h b/plugins/python_wrapper/python_wrapper_remmina.h index bdad92498..d192bd158 100644 --- a/plugins/python_wrapper/python_wrapper_remmina.h +++ b/plugins/python_wrapper/python_wrapper_remmina.h @@ -49,6 +49,7 @@ // I N C L U D E S //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +#include "python_wrapper_common.h" #include "python_wrapper_protocol_widget.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_remmina_file.h b/plugins/python_wrapper/python_wrapper_remmina_file.h index 437973be6..4987ee708 100644 --- a/plugins/python_wrapper/python_wrapper_remmina_file.h +++ b/plugins/python_wrapper/python_wrapper_remmina_file.h @@ -40,6 +40,8 @@ #pragma once +#include "python_wrapper_common.h" + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // A P I //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_secret.h b/plugins/python_wrapper/python_wrapper_secret.h index 192bd05fe..b40e05856 100644 --- a/plugins/python_wrapper/python_wrapper_secret.h +++ b/plugins/python_wrapper/python_wrapper_secret.h @@ -43,6 +43,7 @@ // I N L U C E S //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +#include "python_wrapper_common.h" #include "remmina/plugin.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/python_wrapper/python_wrapper_tool.h b/plugins/python_wrapper/python_wrapper_tool.h index eba1857b1..595e7b3c9 100644 --- a/plugins/python_wrapper/python_wrapper_tool.h +++ b/plugins/python_wrapper/python_wrapper_tool.h @@ -44,6 +44,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #include "remmina/plugin.h" +#include "python_wrapper_common.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // A P I diff --git a/plugins/rdp/rdp_channels.h b/plugins/rdp/rdp_channels.h index 8d5a62780..61d46f530 100644 --- a/plugins/rdp/rdp_channels.h +++ b/plugins/rdp/rdp_channels.h @@ -36,6 +36,7 @@ #pragma once +#include <glib.h> #include <freerdp/freerdp.h> #include <freerdp/client/channels.h> #include <freerdp/client/rdpei.h> diff --git a/plugins/rdp/rdp_event.c b/plugins/rdp/rdp_event.c index 71d444cb6..3d6fcc9ca 100644 --- a/plugins/rdp/rdp_event.c +++ b/plugins/rdp/rdp_event.c @@ -36,7 +36,6 @@ * */ -#include "rdp_plugin.h" #include "rdp_cliprdr.h" #include "rdp_event.h" #include "rdp_monitor.h" diff --git a/plugins/rdp/rdp_event.h b/plugins/rdp/rdp_event.h index 0a3005e0c..bb7b0ee67 100644 --- a/plugins/rdp/rdp_event.h +++ b/plugins/rdp/rdp_event.h @@ -35,6 +35,10 @@ #pragma once +#include <glib.h> +#include "common/remmina_plugin.h" +#include "rdp_plugin.h" + G_BEGIN_DECLS diff --git a/plugins/rdp/rdp_file.c b/plugins/rdp/rdp_file.c index f2578509d..04b51e762 100644 --- a/plugins/rdp/rdp_file.c +++ b/plugins/rdp/rdp_file.c @@ -34,7 +34,6 @@ * */ -#include "common/remmina_plugin.h" #include "remmina/plugin.h" #include "rdp_plugin.h" #include "rdp_file.h" diff --git a/plugins/rdp/rdp_file.h b/plugins/rdp/rdp_file.h index f02cb8dce..278294e14 100644 --- a/plugins/rdp/rdp_file.h +++ b/plugins/rdp/rdp_file.h @@ -35,6 +35,9 @@ #pragma once +#include <glib.h> +#include "common/remmina_plugin.h" + G_BEGIN_DECLS gboolean remmina_rdp_file_import_test(RemminaFilePlugin *plugin, const gchar *from_file); diff --git a/plugins/rdp/rdp_settings.c b/plugins/rdp/rdp_settings.c index 18d685443..5a8ab35f9 100644 --- a/plugins/rdp/rdp_settings.c +++ b/plugins/rdp/rdp_settings.c @@ -34,8 +34,6 @@ * */ - -#include "rdp_plugin.h" #include "rdp_settings.h" #include <freerdp/locale/keyboard.h> diff --git a/plugins/rdp/rdp_settings.h b/plugins/rdp/rdp_settings.h index 2f3a08faf..761a2bed4 100644 --- a/plugins/rdp/rdp_settings.h +++ b/plugins/rdp/rdp_settings.h @@ -35,6 +35,9 @@ #pragma once +#include <glib.h> +#include "rdp_plugin.h" + G_BEGIN_DECLS void remmina_rdp_settings_init(void); diff --git a/plugins/vnc/vnc_plugin.c b/plugins/vnc/vnc_plugin.c index 60c7f65ae..0b1f44828 100644 --- a/plugins/vnc/vnc_plugin.c +++ b/plugins/vnc/vnc_plugin.c @@ -34,7 +34,6 @@ * */ -#include "common/remmina_plugin.h" #include <gmodule.h> #include "vnc_plugin.h" #include <rfb/rfbclient.h> diff --git a/plugins/vnc/vnc_plugin.h b/plugins/vnc/vnc_plugin.h index b79f0c1c7..91b94a4fb 100644 --- a/plugins/vnc/vnc_plugin.h +++ b/plugins/vnc/vnc_plugin.h @@ -33,6 +33,7 @@ */ #pragma once +#include "common/remmina_plugin.h" #ifndef __PLUGIN_CONFIG_H #define __PLUGIN_CONFIG_H diff --git a/plugins/www/www_utils.h b/plugins/www/www_utils.h index 311324cdd..73a6c25ce 100644 --- a/plugins/www/www_utils.h +++ b/plugins/www/www_utils.h @@ -37,6 +37,8 @@ #pragma once +#include "common/remmina_plugin.h" + G_BEGIN_DECLS gint www_utils_string_find(GString *haystack, gint start, gint end, const gchar *needle); gint www_utils_string_replace(GString *str, gint pos, gint len, const gchar *replace); @@ -41,7 +41,6 @@ #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <gtk/gtk.h> #include <stdlib.h> #include "remmina.h" @@ -36,6 +36,7 @@ #pragma once +#include <gtk/gtk.h> #include "remmina_file.h" #include "remmina_message_panel.h" diff --git a/src/remmina.c b/src/remmina.c index 9d658d73e..abc4a3144 100644 --- a/src/remmina.c +++ b/src/remmina.c @@ -39,7 +39,6 @@ #include <gdk/gdkx.h> #include <gio/gio.h> #include <glib/gi18n.h> -#include <gtk/gtk.h> #include <stdlib.h> #include "config.h" diff --git a/src/remmina.h b/src/remmina.h index 79ceb5fa3..b6d9d8b09 100644 --- a/src/remmina.h +++ b/src/remmina.h @@ -34,6 +34,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS extern gboolean kioskmode; G_END_DECLS diff --git a/src/remmina_about.c b/src/remmina_about.c index 2a3dbe09b..81b3f72e5 100644 --- a/src/remmina_about.c +++ b/src/remmina_about.c @@ -35,7 +35,6 @@ * */ -#include <gtk/gtk.h> #include <glib/gi18n.h> #include "remmina_about.h" #include "remmina_public.h" diff --git a/src/remmina_about.h b/src/remmina_about.h index 6b8b24e47..8ce6b8746 100644 --- a/src/remmina_about.h +++ b/src/remmina_about.h @@ -35,6 +35,7 @@ */ #pragma once +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/remmina_applet_menu.c b/src/remmina_applet_menu.c index c25c66217..8512a68e6 100644 --- a/src/remmina_applet_menu.c +++ b/src/remmina_applet_menu.c @@ -36,12 +36,10 @@ #include "config.h" -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <string.h> #include "remmina_public.h" -#include "remmina_applet_menu_item.h" #include "remmina_applet_menu.h" #include "remmina_file_manager.h" #include "remmina_pref.h" diff --git a/src/remmina_applet_menu.h b/src/remmina_applet_menu.h index b7e950bf5..70536ad78 100644 --- a/src/remmina_applet_menu.h +++ b/src/remmina_applet_menu.h @@ -35,6 +35,9 @@ #pragma once +#include <gtk/gtk.h> +#include "remmina_applet_menu_item.h" + G_BEGIN_DECLS #define REMMINA_TYPE_APPLET_MENU (remmina_applet_menu_get_type()) diff --git a/src/remmina_applet_menu_item.c b/src/remmina_applet_menu_item.c index a264be94b..f7f87d153 100644 --- a/src/remmina_applet_menu_item.c +++ b/src/remmina_applet_menu_item.c @@ -34,7 +34,6 @@ * */ -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gprintf.h> #include <string.h> diff --git a/src/remmina_applet_menu_item.h b/src/remmina_applet_menu_item.h index a885116fd..32f8e477d 100644 --- a/src/remmina_applet_menu_item.h +++ b/src/remmina_applet_menu_item.h @@ -35,6 +35,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS #define REMMINA_TYPE_APPLET_MENU_ITEM (remmina_applet_menu_item_get_type()) diff --git a/src/remmina_avahi.c b/src/remmina_avahi.c index 7ab2e0edd..3479d482d 100644 --- a/src/remmina_avahi.c +++ b/src/remmina_avahi.c @@ -34,7 +34,6 @@ * */ -#include <gtk/gtk.h> #include "config.h" #include "remmina_avahi.h" #include "remmina/remmina_trace_calls.h" diff --git a/src/remmina_avahi.h b/src/remmina_avahi.h index 2f7bad567..981110ec6 100644 --- a/src/remmina_avahi.h +++ b/src/remmina_avahi.h @@ -35,6 +35,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS typedef struct _RemminaAvahiPriv RemminaAvahiPriv; diff --git a/src/remmina_chat_window.c b/src/remmina_chat_window.c index f41496a0a..73cdb125c 100644 --- a/src/remmina_chat_window.c +++ b/src/remmina_chat_window.c @@ -34,7 +34,6 @@ * */ -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> #include "remmina_chat_window.h" diff --git a/src/remmina_chat_window.h b/src/remmina_chat_window.h index 69931f0f9..00dd225d9 100644 --- a/src/remmina_chat_window.h +++ b/src/remmina_chat_window.h @@ -35,6 +35,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS #define REMMINA_TYPE_CHAT_WINDOW (remmina_chat_window_get_type()) diff --git a/src/remmina_crypt.c b/src/remmina_crypt.c index 3d99fea75..b0ad67237 100644 --- a/src/remmina_crypt.c +++ b/src/remmina_crypt.c @@ -35,7 +35,6 @@ */ #include "config.h" -#include <glib.h> #ifdef HAVE_LIBGCRYPT #include <gcrypt.h> #endif diff --git a/src/remmina_crypt.h b/src/remmina_crypt.h index b8e87859d..e530c4b4d 100644 --- a/src/remmina_crypt.h +++ b/src/remmina_crypt.h @@ -35,6 +35,8 @@ #pragma once +#include <glib.h> + G_BEGIN_DECLS gchar *remmina_crypt_encrypt(const gchar *str); diff --git a/src/remmina_exec.c b/src/remmina_exec.c index 6b2c5cbd9..1fe596ff6 100644 --- a/src/remmina_exec.c +++ b/src/remmina_exec.c @@ -36,7 +36,6 @@ #include "config.h" #include "buildflags.h" -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <stdlib.h> #include "remmina.h" diff --git a/src/remmina_exec.h b/src/remmina_exec.h index 55aec8ef3..5c3451af2 100644 --- a/src/remmina_exec.h +++ b/src/remmina_exec.h @@ -35,6 +35,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS typedef enum { diff --git a/src/remmina_ext_exec.c b/src/remmina_ext_exec.c index 7f45ec64f..1182266f1 100644 --- a/src/remmina_ext_exec.c +++ b/src/remmina_ext_exec.c @@ -34,14 +34,12 @@ */ #include <gdk/gdkkeysyms.h> -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib.h> #include <stdlib.h> #include <sys/wait.h> #include <unistd.h> #include "remmina_utils.h" -#include "remmina_file.h" #include "remmina_ext_exec.h" #include "remmina_public.h" #include "remmina/remmina_trace_calls.h" diff --git a/src/remmina_ext_exec.h b/src/remmina_ext_exec.h index 38c926fdc..ba972fdab 100644 --- a/src/remmina_ext_exec.h +++ b/src/remmina_ext_exec.h @@ -35,6 +35,9 @@ #pragma once +#include <gtk/gtk.h> +#include "remmina_file.h" + G_BEGIN_DECLS typedef struct { diff --git a/src/remmina_external_tools.c b/src/remmina_external_tools.c index 868031009..97543ca0d 100644 --- a/src/remmina_external_tools.c +++ b/src/remmina_external_tools.c @@ -36,6 +36,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> #include <stdlib.h> +#include "remmina_file.h" #include "remmina/types.h" #include "remmina_public.h" #include "remmina_external_tools.h" diff --git a/src/remmina_external_tools.h b/src/remmina_external_tools.h index f6d78707a..72c378630 100644 --- a/src/remmina_external_tools.h +++ b/src/remmina_external_tools.h @@ -36,7 +36,6 @@ #pragma once #include <gtk/gtk.h> -#include "remmina_file.h" #include "remmina_main.h" G_BEGIN_DECLS diff --git a/src/remmina_ftp_client.c b/src/remmina_ftp_client.c index 3002a0fc1..d0f1a3469 100644 --- a/src/remmina_ftp_client.c +++ b/src/remmina_ftp_client.c @@ -37,14 +37,12 @@ #define _FILE_OFFSET_BITS 64 #include <gdk/gdk.h> -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> #include "config.h" #include "remmina_public.h" #include "remmina_pref.h" #include "remmina_marshals.h" -#include "remmina_file.h" #include "remmina_ftp_client.h" #include "remmina_masterthread_exec.h" #include "remmina/remmina_trace_calls.h" diff --git a/src/remmina_ftp_client.h b/src/remmina_ftp_client.h index 9aa630b8f..e056d3b32 100644 --- a/src/remmina_ftp_client.h +++ b/src/remmina_ftp_client.h @@ -36,6 +36,9 @@ #pragma once +#include <gtk/gtk.h> +#include "remmina_file.h" + G_BEGIN_DECLS #define REMMINA_TYPE_FTP_CLIENT (remmina_ftp_client_get_type()) diff --git a/src/remmina_icon.c b/src/remmina_icon.c index 5c7f8c94c..7d83cc010 100644 --- a/src/remmina_icon.c +++ b/src/remmina_icon.c @@ -36,7 +36,6 @@ #include "config.h" -#include <gtk/gtk.h> #include <glib/gi18n.h> #include "remmina_icon.h" diff --git a/src/remmina_icon.h b/src/remmina_icon.h index a2fc4c751..49fc119a5 100644 --- a/src/remmina_icon.h +++ b/src/remmina_icon.h @@ -35,6 +35,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS void remmina_icon_init(void); diff --git a/src/remmina_key_chooser.c b/src/remmina_key_chooser.c index b49261481..16be584c5 100644 --- a/src/remmina_key_chooser.c +++ b/src/remmina_key_chooser.c @@ -34,7 +34,6 @@ * */ -#include <gtk/gtk.h> #include <glib/gi18n.h> #include "remmina_key_chooser.h" #include "remmina_public.h" diff --git a/src/remmina_key_chooser.h b/src/remmina_key_chooser.h index c8e10b892..fe33b55f8 100644 --- a/src/remmina_key_chooser.h +++ b/src/remmina_key_chooser.h @@ -35,6 +35,8 @@ #pragma once +#include <gtk/gtk.h> + #define KEY_MODIFIER_SHIFT _("Shift+") #define KEY_MODIFIER_CTRL _("Ctrl+") #define KEY_MODIFIER_ALT _("Alt+") diff --git a/src/remmina_message_panel.c b/src/remmina_message_panel.c index 5d4f801bb..47208d2be 100644 --- a/src/remmina_message_panel.c +++ b/src/remmina_message_panel.c @@ -34,7 +34,6 @@ * */ -#include <gtk/gtk.h> #include <glib/gi18n.h> #include "config.h" #include "remmina_public.h" diff --git a/src/remmina_message_panel.h b/src/remmina_message_panel.h index 87838c8f0..f991d26cc 100644 --- a/src/remmina_message_panel.h +++ b/src/remmina_message_panel.h @@ -36,6 +36,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS #define REMMINA_TYPE_MESSAGE_PANEL (remmina_message_panel_get_type()) diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c index 5db892820..1c590b0fc 100644 --- a/src/remmina_protocol_widget.c +++ b/src/remmina_protocol_widget.c @@ -42,8 +42,6 @@ #include <gmodule.h> #include <stdlib.h> - - #include "remmina_chat_window.h" #include "remmina_masterthread_exec.h" #include "remmina_ext_exec.h" diff --git a/src/remmina_scheduler.h b/src/remmina_scheduler.h index 99fc2f581..615b1ff33 100644 --- a/src/remmina_scheduler.h +++ b/src/remmina_scheduler.h @@ -34,6 +34,8 @@ #pragma once +#include <glib.h> + typedef struct { GSourceFunc cb_func_ptr; gpointer cb_func_data; diff --git a/src/remmina_sftp_plugin.c b/src/remmina_sftp_plugin.c index 4a4fd0d98..769344bb6 100644 --- a/src/remmina_sftp_plugin.c +++ b/src/remmina_sftp_plugin.c @@ -45,7 +45,6 @@ #include "remmina_sftp_client.h" #include "remmina_plugin_manager.h" #include "remmina_ssh.h" -#include "remmina_protocol_widget.h" #include "remmina_sftp_plugin.h" #define REMMINA_PLUGIN_SFTP_FEATURE_PREF_SHOW_HIDDEN 1 diff --git a/src/remmina_sftp_plugin.h b/src/remmina_sftp_plugin.h index 1ed80855e..6345e90da 100644 --- a/src/remmina_sftp_plugin.h +++ b/src/remmina_sftp_plugin.h @@ -36,6 +36,9 @@ #pragma once +#include <glib.h> +#include "remmina_protocol_widget.h" + G_BEGIN_DECLS void remmina_sftp_plugin_register(void); diff --git a/src/remmina_sodium.h b/src/remmina_sodium.h index 10b092598..d3edeb72d 100644 --- a/src/remmina_sodium.h +++ b/src/remmina_sodium.h @@ -34,6 +34,8 @@ #pragma once +#include <glib.h> + G_BEGIN_DECLS #include <sodium.h> diff --git a/src/remmina_stats.c b/src/remmina_stats.c index bd5fb0464..4b8e09614 100644 --- a/src/remmina_stats.c +++ b/src/remmina_stats.c @@ -134,12 +134,10 @@ * @see https://www.remmina.org for more info. */ - #include "config.h" #include <string.h> #include <sys/utsname.h> #include <unistd.h> -#include <glib.h> #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gtk/gtk.h> diff --git a/src/remmina_stats.h b/src/remmina_stats.h index 0ed6477bf..9c16b85ce 100644 --- a/src/remmina_stats.h +++ b/src/remmina_stats.h @@ -34,6 +34,8 @@ #pragma once +#include <glib.h> + G_BEGIN_DECLS #include "json-glib/json-glib.h" diff --git a/src/remmina_string_list.c b/src/remmina_string_list.c index 4645f7b98..304fc30e3 100644 --- a/src/remmina_string_list.c +++ b/src/remmina_string_list.c @@ -34,7 +34,6 @@ * */ -#include <gtk/gtk.h> #include <string.h> #include "config.h" #include "remmina_public.h" diff --git a/src/remmina_string_list.h b/src/remmina_string_list.h index 1ec08ff00..bee98b2ba 100644 --- a/src/remmina_string_list.h +++ b/src/remmina_string_list.h @@ -36,6 +36,8 @@ #pragma once +#include <gtk/gtk.h> + typedef gboolean (*RemminaStringListValidationFunc)(const gchar *new_str, gchar **error); typedef struct _RemminaStringListPriv { diff --git a/src/remmina_sysinfo.c b/src/remmina_sysinfo.c index 07a15498b..cc916b3b3 100644 --- a/src/remmina_sysinfo.c +++ b/src/remmina_sysinfo.c @@ -35,7 +35,6 @@ */ #include "config.h" -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/src/remmina_sysinfo.h b/src/remmina_sysinfo.h index c9daea57b..5c6d7c3f6 100644 --- a/src/remmina_sysinfo.h +++ b/src/remmina_sysinfo.h @@ -34,6 +34,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS gboolean remmina_sysinfo_is_appindicator_available(void); diff --git a/src/remmina_unlock.c b/src/remmina_unlock.c index 8e878ae32..68fe18c2a 100644 --- a/src/remmina_unlock.c +++ b/src/remmina_unlock.c @@ -34,7 +34,6 @@ #include <stdlib.h> -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib.h> #include <glib/gprintf.h> diff --git a/src/remmina_unlock.h b/src/remmina_unlock.h index cb3804c9f..8176ccf42 100644 --- a/src/remmina_unlock.h +++ b/src/remmina_unlock.h @@ -35,6 +35,7 @@ #pragma once #include <sodium.h> +#include <gtk/gtk.h> #if SODIUM_VERSION_INT >= 90200 typedef struct _RemminaUnlockDialog { diff --git a/src/remmina_utils.c b/src/remmina_utils.c index 26e5f3334..5d23b2fba 100644 --- a/src/remmina_utils.c +++ b/src/remmina_utils.c @@ -41,7 +41,6 @@ #include <sys/utsname.h> #include <locale.h> -#include <glib.h> #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gio/gio.h> diff --git a/src/remmina_utils.h b/src/remmina_utils.h index 400d8f2f2..a801f5e09 100644 --- a/src/remmina_utils.h +++ b/src/remmina_utils.h @@ -39,6 +39,8 @@ #pragma once +#include <glib.h> + G_BEGIN_DECLS gint remmina_utils_string_find(GString *haystack, gint start, gint end, const gchar *needle); gint remmina_utils_string_replace(GString *str, gint pos, gint len, const gchar *replace); diff --git a/src/remmina_widget_pool.c b/src/remmina_widget_pool.c index 0b9828186..68774fcc4 100644 --- a/src/remmina_widget_pool.c +++ b/src/remmina_widget_pool.c @@ -34,7 +34,6 @@ * */ -#include <gtk/gtk.h> #include <gmodule.h> #include "remmina_public.h" #include "remmina_widget_pool.h" diff --git a/src/remmina_widget_pool.h b/src/remmina_widget_pool.h index 33cb8031a..84291db1f 100644 --- a/src/remmina_widget_pool.h +++ b/src/remmina_widget_pool.h @@ -35,6 +35,8 @@ #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS typedef gboolean (*RemminaWidgetPoolForEachFunc)(GtkWidget *widget, gpointer data); diff --git a/src/rmnews.c b/src/rmnews.c index 289a55061..d4ae81d22 100644 --- a/src/rmnews.c +++ b/src/rmnews.c @@ -40,7 +40,6 @@ #include <gio/gio.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gtk/gtk.h> #include <libsoup/soup.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/rmnews.h b/src/rmnews.h index e68bca3ab..734ffe1d0 100644 --- a/src/rmnews.h +++ b/src/rmnews.h @@ -48,6 +48,8 @@ typedef struct _RemminaNewsDialog { #pragma once +#include <gtk/gtk.h> + G_BEGIN_DECLS extern gboolean disablenews; void rmnews_schedule(); |