Headers refactoring

21 files changed, 29 insertions, 7 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);