diff --git a/codenav/src/utils.c b/codenav/src/utils.c
index fda97907f..19af83ebf 100644
--- a/codenav/src/utils.c
+++ b/codenav/src/utils.c
@@ -19,7 +19,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils.h"
+#include "geanyplugin.h"
 
  /**
  * @brief	Function which returns the extension of the file path which 
@@ -107,4 +107,3 @@ strrpos(const gchar *haystack, const gchar *needle)
 	  return p - haystack;
    return -1;   // not found
 }
-
diff --git a/devhelp/src/Makefile.am b/devhelp/src/Makefile.am
index ac15bb8fc..008ab8182 100644
--- a/devhelp/src/Makefile.am
+++ b/devhelp/src/Makefile.am
@@ -25,6 +25,7 @@ devhelp_la_CFLAGS = \
 
 devhelp_la_LIBADD = \
 	$(DEVHELP_LIBS) \
+	$(COMMONLIBS) \
 	$(top_builddir)/devhelp/devhelp/libdevhelp-2.la
 
 include $(top_srcdir)/build/cppcheck.mk
diff --git a/geanyminiscript/src/gms_gui.c b/geanyminiscript/src/gms_gui.c
index d8dbfc3f2..04ebb4c21 100644
--- a/geanyminiscript/src/gms_gui.c
+++ b/geanyminiscript/src/gms_gui.c
@@ -26,7 +26,7 @@
  * \brief it is the graphical user interface of the geany miniscript plugin
  */
 #include    "config.h"
-#include    "geany.h"
+#include    "geanyplugin.h"
 
 #include    <glib/gstdio.h>
 #include    <glib/gprintf.h>
@@ -43,15 +43,6 @@
 #include    <locale.h>
 #endif
 
-/* geany headers */
-#include    "support.h"
-#include    "plugindata.h"
-#include    "editor.h"
-#include    "document.h"
-#include    "prefs.h"
-#include    "utils.h"
-#include    "ui_utils.h"
-
 /* user header */
 #include    "gms_debug.h"
 #include    "gms.h"
diff --git a/shiftcolumn/src/shiftcolumn.c b/shiftcolumn/src/shiftcolumn.c
index 541993531..0c483ae86 100644
--- a/shiftcolumn/src/shiftcolumn.c
+++ b/shiftcolumn/src/shiftcolumn.c
@@ -23,20 +23,12 @@
 # include "config.h"
 #endif
 
-#include "geany.h"
-#include "support.h"
+#include "geanyplugin.h"
 
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
 
-#include "ui_utils.h"
-
-#include "document.h"
-#include "keybindings.h"
-#include "plugindata.h"
-#include "geanyfunctions.h"
-
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <gdk/gdkkeysyms.h>