diff --git a/lib/Utils.vala b/lib/Utils.vala
index 80048965..d84ce45c 100644
--- a/lib/Utils.vala
+++ b/lib/Utils.vala
@@ -15,10 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // 
 
-using Meta;
-
-using Gala;
-
 namespace Gala
 {
 	public class Utils
@@ -76,7 +72,7 @@ namespace Gala
 		/**
 		 * returns a pixbuf for the application of this window or a default icon
 		 **/
-		public static Gdk.Pixbuf get_icon_for_window (Window window, int size)
+		public static Gdk.Pixbuf get_icon_for_window (Meta.Window window, int size)
 		{
 			Gdk.Pixbuf? result = null;
 			
@@ -157,7 +153,7 @@ namespace Gala
 		/**
 		 * get the next window that should be active on a workspace right now
 		 **/
-		public static Window get_next_window (Meta.Workspace workspace, bool backward=false)
+		public static Meta.Window get_next_window (Meta.Workspace workspace, bool backward=false)
 		{
 			var screen = workspace.get_screen ();
 			var display = screen.get_display ();
@@ -174,15 +170,15 @@ namespace Gala
 		/**
 		 * get the number of toplevel windows on a workspace
 		 **/
-		public static uint get_n_windows (Workspace workspace)
+		public static uint get_n_windows (Meta.Workspace workspace)
 		{
 			var n = 0;
 			foreach (var window in workspace.list_windows ()) {
 				if (window.is_on_all_workspaces ())
 					continue;
-				if (window.window_type == WindowType.NORMAL ||
-					window.window_type == WindowType.DIALOG ||
-					window.window_type == WindowType.MODAL_DIALOG)
+				if (window.window_type == Meta.WindowType.NORMAL ||
+					window.window_type == Meta.WindowType.DIALOG ||
+					window.window_type == Meta.WindowType.MODAL_DIALOG)
 					n ++;
 			}
 		
@@ -203,7 +199,7 @@ namespace Gala
 			return fallback_style;
 		}
 
-		public static void get_window_frame_offset (Window window, out float x, out float y, out float width, out float height)
+		public static void get_window_frame_offset (Meta.Window window, out float x, out float y, out float width, out float height)
 		{
 			var actor = window.get_compositor_private () as Clutter.Actor;
 			var frame = window.get_outer_rect ();
diff --git a/plugins/zoom/Main.vala b/plugins/zoom/Main.vala
index 8aab0386..34f90ca2 100644
--- a/plugins/zoom/Main.vala
+++ b/plugins/zoom/Main.vala
@@ -15,8 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // 
 
-using Clutter;
-
 namespace Gala.Plugins.Zoom
 {
 	public class Main : Object, Gala.Plugin
@@ -89,7 +87,7 @@ namespace Gala.Plugins.Zoom
 					if (wins.scale_center_x == mx && wins.scale_center_y == my)
 						return true;
 					
-					wins.animate (AnimationMode.LINEAR, MOUSE_POLL_TIME, scale_center_x : mx, scale_center_y : my);
+					wins.animate (Clutter.AnimationMode.LINEAR, MOUSE_POLL_TIME, scale_center_x : mx, scale_center_y : my);
 					
 					return true;
 				});
@@ -104,7 +102,7 @@ namespace Gala.Plugins.Zoom
 					Source.remove (mouse_poll_timer);
 				mouse_poll_timer = 0;
 				
-				wins.animate (AnimationMode.EASE_OUT_CUBIC, 300, scale_x : 1.0f, scale_y : 1.0f).completed.connect (() => {
+				wins.animate (Clutter.AnimationMode.EASE_OUT_CUBIC, 300, scale_x : 1.0f, scale_y : 1.0f).completed.connect (() => {
 					wins.scale_center_x = 0.0f;
 					wins.scale_center_y = 0.0f;
 				});
@@ -112,7 +110,7 @@ namespace Gala.Plugins.Zoom
 				return;
 			}
 			
-			wins.animate (AnimationMode.EASE_OUT_CUBIC, 300, scale_x : current_zoom, scale_y : current_zoom);
+			wins.animate (Clutter.AnimationMode.EASE_OUT_CUBIC, 300, scale_x : current_zoom, scale_y : current_zoom);
 		}
 	}
 }