diff --git a/gitg/gitg-application.vala b/gitg/gitg-application.vala
index ada8c7b8..9487dc14 100644
--- a/gitg/gitg-application.vala
+++ b/gitg/gitg-application.vala
@@ -51,7 +51,7 @@ public class Application : Gtk.Application
 			return true;
 		}
 
-		public static const OptionEntry[] entries = {
+		public const OptionEntry[] entries = {
 			{"version", 'v', OptionFlags.NO_ARG, OptionArg.CALLBACK,
 			 (void *)show_version_and_quit, N_("Show the application's version"), null},
 
@@ -306,7 +306,7 @@ public class Application : Gtk.Application
 		AuthorDetailsDialog.show_global(window);
 	}
 
-	private static const ActionEntry[] app_entries = {
+	private const ActionEntry[] app_entries = {
 		{"new", on_app_new_window_activated},
 		{"about", on_app_about_activated},
 		{"quit", on_app_quit_activated},
@@ -315,7 +315,7 @@ public class Application : Gtk.Application
 	};
 
 #if GTK_SHORTCUTS_WINDOW
-	private static const ActionEntry[] shortcut_window_entries = {
+	private const ActionEntry[] shortcut_window_entries = {
 		{"shortcuts", on_shortcuts_activated}
 	};
 #endif
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index ffc9696c..58904c74 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -149,7 +149,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
 		return true;
 	}
 
-	private static const ActionEntry[] win_entries = {
+	private const ActionEntry[] win_entries = {
 		{"search", on_search_activated, null, "false", null},
 		{"gear-menu", on_gear_menu_activated, null, "false", null},
 		{"close", on_close_activated},
diff --git a/gitg/history/gitg-history-command-line.vala b/gitg/history/gitg-history-command-line.vala
index 03755859..6ff602db 100644
--- a/gitg/history/gitg-history-command-line.vala
+++ b/gitg/history/gitg-history-command-line.vala
@@ -37,7 +37,7 @@ class CommandLine : Object, GitgExt.CommandLine
 	private bool d_all_remotes;
 	private bool d_all_tags;
 
-	private static const OptionEntry[] s_entries = {
+	private const OptionEntry[] s_entries = {
 		{ "all", 'a', OptionFlags.IN_MAIN, OptionArg.NONE, ref s_all_commits,
 		  N_("Select all commits by default in the history activity"), null },
 		{ "branches", 'b', OptionFlags.IN_MAIN, OptionArg.NONE, ref s_all_branches,
diff --git a/libgitg/gitg-color.vala b/libgitg/gitg-color.vala
index dd9a443e..7766e22f 100644
--- a/libgitg/gitg-color.vala
+++ b/libgitg/gitg-color.vala
@@ -29,7 +29,7 @@ public class Color : Object
 		ushort b;
 	}
 
-	private static const Rgb[] palette = {
+	private const Rgb[] palette = {
 		{196, 160, 0},
 		{78, 154, 6},
 		{206, 92, 0},
diff --git a/libgitg/gitg-diff-image-side-by-side.vala b/libgitg/gitg-diff-image-side-by-side.vala
index 254b25e1..cc856b62 100644
--- a/libgitg/gitg-diff-image-side-by-side.vala
+++ b/libgitg/gitg-diff-image-side-by-side.vala
@@ -22,7 +22,7 @@ class Gitg.DiffImageSideBySide : Gtk.DrawingArea
 	private Pango.Layout d_old_size_layout;
 	private Pango.Layout d_new_size_layout;
 
-	private static const int TEXT_SPACING = 6;
+	private const int TEXT_SPACING = 6;
 
 	private Pango.Layout? old_size_layout
 	{
diff --git a/libgitg/gitg-label-renderer.vala b/libgitg/gitg-label-renderer.vala
index 1f67d687..f89e9f64 100644
--- a/libgitg/gitg-label-renderer.vala
+++ b/libgitg/gitg-label-renderer.vala
@@ -21,8 +21,8 @@ namespace Gitg
 {
 	public class LabelRenderer
 	{
-		private static const int margin = 2;
-		private static const int padding = 6;
+		private const int margin = 2;
+		private const int padding = 6;
 
 		private static string label_text(Ref r)
 		{