diff --git a/src/Makefile.am b/src/Makefile.am
index be8bb95aa..a85c1e577 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,8 +152,8 @@ libmutter_la_SOURCES =				\
 	core/frame.h				\
 	ui/gradient.c				\
 	meta/gradient.h				\
-	core/gesture-tracker.c			\
-	core/gesture-tracker-private.h		\
+	core/meta-gesture-tracker.c		\
+	core/meta-gesture-tracker-private.h	\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
diff --git a/src/core/display-private.h b/src/core/display-private.h
index a847d9bb3..034b44723 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -35,7 +35,7 @@
 #include <meta/boxes.h>
 #include <meta/display.h>
 #include "keybindings-private.h"
-#include "gesture-tracker-private.h"
+#include "meta-gesture-tracker-private.h"
 #include <meta/prefs.h>
 #include <meta/barrier.h>
 #include <clutter/clutter.h>
diff --git a/src/core/gesture-tracker-private.h b/src/core/meta-gesture-tracker-private.h
similarity index 100%
rename from src/core/gesture-tracker-private.h
rename to src/core/meta-gesture-tracker-private.h
diff --git a/src/core/gesture-tracker.c b/src/core/meta-gesture-tracker.c
similarity index 99%
rename from src/core/gesture-tracker.c
rename to src/core/meta-gesture-tracker.c
index 7f86663c9..10d9ca6d1 100644
--- a/src/core/gesture-tracker.c
+++ b/src/core/meta-gesture-tracker.c
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "gesture-tracker-private.h"
+#include "meta-gesture-tracker-private.h"
 #include "meta-surface-actor.h"
 
 #define DISTANCE_THRESHOLD 30