diff --git a/capplets/file-types/Makefile.am b/capplets/file-types/Makefile.am
index b77669737..3b359226f 100644
--- a/capplets/file-types/Makefile.am
+++ b/capplets/file-types/Makefile.am
@@ -17,19 +17,18 @@ INCLUDES = -I. 						\
 bin_PROGRAMS = file-types-capplet
 
 file_types_capplet_SOURCES =			\
-	nautilus-mime-type-capplet.h 		\
-	nautilus-mime-type-capplet-dialogs.h 	\
-	nautilus-mime-type-icon-entry.h		\
-	nautilus-mime-type-capplet.c		\
-	nautilus-mime-type-capplet-dialogs.c 	\
-	nautilus-mime-type-icon-entry.c		\
+	file-types-capplet.h 		\
+	file-types-capplet-dialogs.h 	\
+	file-types-icon-entry.h		\
+	file-types-capplet.c		\
+	file-types-capplet-dialogs.c 	\
+	file-types-icon-entry.c		\
 	$(NULL)
 
 
 file_types_capplet_LDADD =						\
 			@VFS_CAPPLET_LIBS@				\
 			$(INTLLIBS) 					\
-			$(top_builddir)/libgnomevfs/libgnomevfs.la 	\
 			-lgdk_pixbuf					\
 			$/libuuid/libuuid.a				\
 			$(NULL)
diff --git a/capplets/file-types/file-types-capplet-dialogs.c b/capplets/file-types/file-types-capplet-dialogs.c
index c554c72b1..34dbe81d3 100644
--- a/capplets/file-types/file-types-capplet-dialogs.c
+++ b/capplets/file-types/file-types-capplet-dialogs.c
@@ -38,8 +38,8 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #include "libuuid/uuid.h"
-#include "nautilus-mime-type-capplet.h"
-#include "nautilus-mime-type-capplet-dialogs.h"
+#include "file-types-capplet.h"
+#include "file-types-capplet-dialogs.h"
 
 /* gtk_window_set_default_width (and some other functions) use a
  * magic undocumented number of -2 to mean "ignore this parameter".
diff --git a/capplets/file-types/file-types-capplet.c b/capplets/file-types/file-types-capplet.c
index b40ce7d58..ee275a7c1 100644
--- a/capplets/file-types/file-types-capplet.c
+++ b/capplets/file-types/file-types-capplet.c
@@ -43,10 +43,10 @@
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include "nautilus-mime-type-capplet-dialogs.h"
-#include "nautilus-mime-type-icon-entry.h"
+#include "file-types-capplet-dialogs.h"
+#include "file-types-icon-entry.h"
 
-#include "nautilus-mime-type-capplet.h"
+#include "file-types-capplet.h"
 
 #define DEFAULT_REGULAR_ICON "nautilus/i-regular-24.png"
 #define DEFAULT_ACTION_ICON "nautilus/i-executable.png"
diff --git a/capplets/file-types/file-types-icon-entry.c b/capplets/file-types/file-types-icon-entry.c
index e2133743a..1633011a2 100644
--- a/capplets/file-types/file-types-icon-entry.c
+++ b/capplets/file-types/file-types-icon-entry.c
@@ -11,8 +11,8 @@
  */
 #include <config.h>
 
-#include "nautilus-mime-type-icon-entry.h"
-#include "nautilus-mime-type-capplet.h"
+#include "file-types-icon-entry.h"
+#include "file-types-capplet.h"
 
 #include <gdk_imlib.h>
 #include <gnome.h>
diff --git a/capplets/file-types/libuuid/Makefile.am b/capplets/file-types/libuuid/Makefile.am
index b89fb23b5..2d29f918e 100644
--- a/capplets/file-types/libuuid/Makefile.am
+++ b/capplets/file-types/libuuid/Makefile.am
@@ -22,6 +22,6 @@ libuuid_a_SOURCES = \
 	$(NULL)
 
 INCLUDES = \
-	$(GLIB_CFLAGS)	\
+	@GLIB_CFLAGS@	\
 	$(WERROR)	\
 	$(NULL)