diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b90ac384ce..a9e623e752 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -389,7 +389,6 @@ gtk_private_h_sources =		\
 	gtkcssparserprivate.h	\
 	gtkcssproviderprivate.h	\
 	gtkcssselectorprivate.h	\
-	gtkcssstringfuncsprivate.h	\
 	gtkcustompaperunixdialog.h \
 	gtkdndcursors.h		\
 	gtkentryprivate.h	\
@@ -434,6 +433,7 @@ gtk_private_h_sources =		\
 	gtksocketprivate.h	\
 	gtkstylecontextprivate.h \
 	gtkstylepropertiesprivate.h \
+	gtkstylepropertyprivate.h \
 	gtktextbtree.h		\
 	gtktextbufferserialize.h \
 	gtktextchildprivate.h	\
@@ -518,7 +518,6 @@ gtk_base_c_sources = 		\
 	gtkcssparser.c		\
 	gtkcssprovider.c	\
 	gtkcssselector.c	\
-	gtkcssstringfuncs.c	\
 	gtkdialog.c		\
 	gtkdrawingarea.c	\
 	gtkeditable.c		\
@@ -636,6 +635,7 @@ gtk_base_c_sources = 		\
 	gtkstock.c		\
 	gtkstylecontext.c	\
 	gtkstyleproperties.c	\
+	gtkstyleproperty.c	\
 	gtkstyleprovider.c	\
 	gtkstyle.c		\
 	gtkswitch.c		\
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index c58b3d4d22..32a964255d 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -29,11 +29,11 @@
 
 #include "gtkcssparserprivate.h"
 #include "gtkcssselectorprivate.h"
-#include "gtkcssstringfuncsprivate.h"
 #include "gtksymboliccolor.h"
 #include "gtkstyleprovider.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkstylepropertiesprivate.h"
+#include "gtkstylepropertyprivate.h"
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkcssstringfuncs.c b/gtk/gtkstyleproperty.c
similarity index 99%
rename from gtk/gtkcssstringfuncs.c
rename to gtk/gtkstyleproperty.c
index 3576e63687..39125d24c9 100644
--- a/gtk/gtkcssstringfuncs.c
+++ b/gtk/gtkstyleproperty.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkcssstringfuncsprivate.h"
+#include "gtkstylepropertyprivate.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/gtk/gtkcssstringfuncsprivate.h b/gtk/gtkstylepropertyprivate.h
similarity index 90%
rename from gtk/gtkcssstringfuncsprivate.h
rename to gtk/gtkstylepropertyprivate.h
index 8b47770194..3db8e5480e 100644
--- a/gtk/gtkcssstringfuncsprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GTK_CSS_STRINGFUNCS_PRIVATE_H__
-#define __GTK_CSS_STRINGFUNCS_PRIVATE_H__
+#ifndef __GTK_STYLEPROPERTY_PRIVATE_H__
+#define __GTK_STYLEPROPERTY_PRIVATE_H__
 
 #include "gtkcssparserprivate.h"
 
@@ -31,4 +31,4 @@ char *                  _gtk_css_value_to_string          (const GValue  *value)
 
 G_END_DECLS
 
-#endif /* __GTK_CSS_STRINGFUNCS_PRIVATE_H__ */
+#endif /* __GTK_CSS_STYLEPROPERTY_PRIVATE_H__ */