diff --git a/dmenubar/config.mk b/dmenubar/config.mk
index 195fd4c..525ef17 100644
--- a/dmenubar/config.mk
+++ b/dmenubar/config.mk
@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 2.3
+VERSION = 2.4
 
 # Customize below to fit your system
 
diff --git a/dmenubar/dmenu.h b/dmenubar/dmenu.h
index bb3b144..2174688 100644
--- a/dmenubar/dmenu.h
+++ b/dmenubar/dmenu.h
@@ -14,25 +14,20 @@
 /* color */
 enum { ColFG, ColBG, ColLast };
 
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
-	int ascent;
-	int descent;
-	int height;
-};
-
-struct DC {
+typedef struct {
 	int x, y, w, h;
 	unsigned long norm[ColLast];
 	unsigned long sel[ColLast];
 	Drawable drawable;
-	Fnt font;
 	GC gc;
-}; /* draw context */
+	struct {
+		XFontStruct *xfont;
+		XFontSet set;
+		int ascent;
+		int descent;
+		int height;
+	} font;
+} DC; /* draw context */
 
 extern int screen;
 extern Display *dpy;