diff --git a/codenav/src/utils.c b/codenav/src/utils.c
index fda97907f..cd6414271 100644
--- a/codenav/src/utils.c
+++ b/codenav/src/utils.c
@@ -21,6 +21,8 @@
 
 #include "utils.h"
 
+#include <geanyplugin.h>
+
  /**
  * @brief	Function which returns the extension of the file path which 
  * 			is given, or NULL if it did not found any extension.
diff --git a/shiftcolumn/src/shiftcolumn.c b/shiftcolumn/src/shiftcolumn.c
index cb6e0c6d0..80c4b1ed6 100644
--- a/shiftcolumn/src/shiftcolumn.c
+++ b/shiftcolumn/src/shiftcolumn.c
@@ -23,19 +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 <glib.h>
 #include <glib/gprintf.h>
 #include <gdk/gdkkeysyms.h>