diff --git a/.gitignore b/.gitignore
index e7a698765..fa167b7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ awesome-menu.1
 awesome.1
 awesomerc.5
 awesomerc
-uicbgen.h
 widgetgen.h
 layoutgen.h
 awesome-version-internal.h
diff --git a/Makefile.am b/Makefile.am
index a0ca5c97b..1bda0c11f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,13 +66,6 @@ defconfig.h: awesomerc
 	@$(SED) 's,\\,\\\\,g;s/$$/\\n\\/;s/"/\\"/g' "awesomerc" >> defconfig.h
 	@echo "\";" >> defconfig.h
 
-CLEANFILES    += uicbgen.h
-BUILT_SOURCES += uicbgen.h
-EXTRA_DIST    += build-utils/uicbgen.sh
-uicbgen.h: $(awesome_SOURCES)
-	@echo "generating uicbgen.h from headers file"
-	$(top_srcdir)/build-utils/uicbgen.sh "$(top_srcdir)" > uicbgen.h
-
 CLEANFILES    += layoutgen.h
 BUILT_SOURCES += layoutgen.h
 EXTRA_DIST    += build-utils/layoutgen.sh
diff --git a/build-utils/uicbgen.sh b/build-utils/uicbgen.sh
deleted file mode 100755
index 6c44b19b7..000000000
--- a/build-utils/uicbgen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-top_srcdir="${1-.}"
-echo "/* This file is autogenerated by" $(basename $0) "*/"
-echo
-echo "const name_func_link_t UicbList[] ="
-echo "{"
-for file in ${top_srcdir}/*.h ${top_srcdir}/layouts/*.h
-do
-    echo "    /* $file */"
-    grep '^uicb_t uicb_' $file | cut -d' ' -f2 | cut -d\; -f1 | while read uicb
-    do
-        shortname=$(echo $uicb | cut -d _ -f2-)
-        echo "    {\"$shortname\", $uicb},"
-    done
-done
-
-echo "    {NULL, NULL}"
-echo "};"
diff --git a/uicb.c b/uicb.c
index 5e7fdfb04..057fa5abc 100644
--- a/uicb.c
+++ b/uicb.c
@@ -44,7 +44,56 @@
 
 extern AwesomeConf globalconf;
 
-#include "uicbgen.h"
+const name_func_link_t UicbList[] =
+{
+    /* awesome.h */
+    { "quit", uicb_quit },
+    /* client.h */
+    { "client_kill", uicb_client_kill },
+    { "client_moveresize", uicb_client_moveresize },
+    { "client_settrans", uicb_client_settrans },
+    { "client_swap", uicb_client_swap },
+    { "client_togglemax", uicb_client_togglemax },
+    { "client_focus", uicb_client_focus },
+    { "client_setfloating", uicb_client_setfloating },
+    { "client_togglescratch", uicb_client_togglescratch },
+    { "client_setscratch", uicb_client_setscratch },
+    /* focus.h */
+    { "focus_history", uicb_focus_history },
+    { "focus_client_byname", uicb_focus_client_byname },
+    /* layout.h */
+    { "tag_setlayout", uicb_tag_setlayout },
+    /* mouse.h */
+    { "client_movemouse", uicb_client_movemouse },
+    { "client_resizemouse", uicb_client_resizemouse },
+    /* screen.h */
+    { "screen_focus", uicb_screen_focus },
+    { "client_movetoscreen", uicb_client_movetoscreen },
+    /* statusbar.h */
+    { "statusbar_toggle", uicb_statusbar_toggle },
+    /* tag.h */
+    { "client_tag", uicb_client_tag },
+    { "client_toggletag", uicb_client_toggletag },
+    { "tag_toggleview", uicb_tag_toggleview },
+    { "tag_view", uicb_tag_view },
+    { "tag_prev_selected", uicb_tag_prev_selected },
+    { "tag_viewnext", uicb_tag_viewnext },
+    { "tag_viewprev", uicb_tag_viewprev },
+    { "tag_create", uicb_tag_create },
+    /* titlebar.h */
+    { "client_toggletitlebar", uicb_client_toggletitlebar },
+    /* uicb.h */
+    { "restart", uicb_restart },
+    { "exec", uicb_exec },
+    { "spawn", uicb_spawn },
+    /* widget.h */
+    { "widget_tell", uicb_widget_tell },
+    /* layouts/tile.h */
+    { "tag_setnmaster", uicb_tag_setnmaster},
+    { "tag_setncol", uicb_tag_setncol },
+    { "tag_setmwfact", uicb_tag_setmwfact },
+    { NULL, NULL }
+};
 
 /** Restart awesome with the current command line.
  * \param screen The virtual screen number.