diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index f7d791d4..7ed8ced9 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -35,7 +35,6 @@ libWINGs_a_SOURCES = 	\
 	dragsource.c \
 	error.c \
 	findfile.c \
-	fontmanager.c \
 	hashtable.c \
 	host.c \
 	international.c \
diff --git a/WINGs/fontmanager.c b/WINGs/fontmanager.c
deleted file mode 100644
index b71904e7..00000000
--- a/WINGs/fontmanager.c
+++ /dev/null
@@ -1,88 +0,0 @@
-
-#include "WINGsP.h"
-
-
-static void
-changeFontProp(char *fname, char *newprop, int which)
-{
-	char before[128], prop[128], after[128];
-	char *ptr, *bptr;
-	int part=0;
-	
-	if(!fname || !prop)
-		return;
-
-	ptr = fname;
-	bptr = before;
-	while (*ptr) {
-		if(*ptr == '-') {
-    	    *bptr = 0;
-			if(part==which) bptr = prop;
-			else if(part==which+1) bptr = after;
-    	  	*bptr++ = *ptr;
-			part++;
-		} else {
-    	  *bptr++ = *ptr;
-		}  ptr++;
-	}*bptr = 0;
-	snprintf(fname, 255, "%s-%s%s", before, newprop, after); 
-}
-
-
-WMFont *
-WMConvertFontToPlain(WMScreen *scr, WMFont *font) 
-{
-    if(!scr || !font)
-        return font;
-
-    return font;
-}
-
-WMFont *
-WMConvertFontToBold(WMScreen *scr, WMFont *font) 
-{
-	WMFont *newfont=NULL;
-	char fname[256];
-
-	if(!scr || !font)
-        return font;
-
-	snprintf(fname, 255, font->name);
-	changeFontProp(fname, "bold", 2);
-	newfont = WMCreateNormalFont(scr, fname);
-
-	if(!newfont)
-		newfont = font;
-
-	return newfont;
-}
-
-WMFont *
-WMConvertFontToItalic(WMScreen *scr, WMFont *font) 
-{
-	WMFont *newfont=NULL;
-	char fname[256];
-
-	if(!scr || !font)
-        return font;
-
-	snprintf(fname, 255, font->name);
-	changeFontProp(fname, "o", 3);
-	newfont = WMCreateNormalFont(scr, fname);
-
-	if(!newfont)
-		newfont = font;
-
-	return newfont;
-}
-
-WMFont *
-WMGetFontOfSize(WMScreen *scr, WMFont *font, int size) 
-{
-    if(!scr || !font || size<1)
-        return font;
-
-    return font;
-}
-
-
diff --git a/WINGs/wfont.c b/WINGs/wfont.c
index a750cd0b..194fdc5d 100644
--- a/WINGs/wfont.c
+++ b/WINGs/wfont.c
@@ -450,3 +450,88 @@ makeFontSetOfSize(char *fontset, int size)
     return newfs;
 }
 
+
+static void
+changeFontProp(char *fname, char *newprop, int which)
+{
+	char before[128], prop[128], after[128];
+	char *ptr, *bptr;
+	int part=0;
+	
+	if(!fname || !prop)
+		return;
+
+	ptr = fname;
+	bptr = before;
+	while (*ptr) {
+		if(*ptr == '-') {
+    	    *bptr = 0;
+			if(part==which) bptr = prop;
+			else if(part==which+1) bptr = after;
+    	  	*bptr++ = *ptr;
+			part++;
+		} else {
+    	  *bptr++ = *ptr;
+		}  ptr++;
+	}*bptr = 0;
+	snprintf(fname, 255, "%s-%s%s", before, newprop, after); 
+}
+
+
+WMFont *
+WMConvertFontToPlain(WMScreen *scr, WMFont *font) 
+{
+    if(!scr || !font)
+        return NULL;
+
+    return font;
+}
+
+WMFont *
+WMConvertFontToBold(WMScreen *scr, WMFont *font) 
+{
+	WMFont *newfont=NULL;
+	char fname[256];
+
+	if(!scr || !font)
+        return NULL;
+
+	snprintf(fname, 255, font->name);
+	changeFontProp(fname, "bold", 2);
+	newfont = WMCreateNormalFont(scr, fname);
+
+	if(!newfont)
+        return NULL;
+
+	return newfont;
+}
+
+WMFont *
+WMConvertFontToItalic(WMScreen *scr, WMFont *font) 
+{
+	WMFont *newfont=NULL;
+	char fname[256];
+
+	if(!scr || !font)
+        return NULL;
+
+	snprintf(fname, 255, font->name);
+	changeFontProp(fname, "o", 3);
+	newfont = WMCreateNormalFont(scr, fname);
+
+	if(!newfont)
+        return NULL;
+
+	return newfont;
+}
+
+WMFont *
+WMGetFontOfSize(WMScreen *scr, WMFont *font, int size) 
+{
+    if(!scr || !font || size<1)
+        return NULL;
+
+    return font;
+}
+
+