diff --git a/config.h.in b/config.h.in
index 27aef3984..95200bf9a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -25,6 +25,9 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef off_t
 
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 
@@ -68,33 +71,12 @@
 /* Define if you have the dcgettext function.  */
 #undef HAVE_DCGETTEXT
 
-/* Define if you have the feof_unlocked function.  */
-#undef HAVE_FEOF_UNLOCKED
-
-/* Define if you have the fgets_unlocked function.  */
-#undef HAVE_FGETS_UNLOCKED
-
 /* Define if you have the getcwd function.  */
 #undef HAVE_GETCWD
 
-/* Define if you have the getegid function.  */
-#undef HAVE_GETEGID
-
-/* Define if you have the geteuid function.  */
-#undef HAVE_GETEUID
-
-/* Define if you have the getgid function.  */
-#undef HAVE_GETGID
-
 /* Define if you have the getpagesize function.  */
 #undef HAVE_GETPAGESIZE
 
-/* Define if you have the getuid function.  */
-#undef HAVE_GETUID
-
-/* Define if you have the mempcpy function.  */
-#undef HAVE_MEMPCPY
-
 /* Define if you have the munmap function.  */
 #undef HAVE_MUNMAP
 
@@ -119,12 +101,6 @@
 /* Define if you have the strdup function.  */
 #undef HAVE_STRDUP
 
-/* Define if you have the strtoul function.  */
-#undef HAVE_STRTOUL
-
-/* Define if you have the tsearch function.  */
-#undef HAVE_TSEARCH
-
 /* Define if you have the <argz.h> header file.  */
 #undef HAVE_ARGZ_H
 
@@ -140,12 +116,6 @@
 /* Define if you have the <nl_types.h> header file.  */
 #undef HAVE_NL_TYPES_H
 
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
@@ -155,6 +125,9 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the i library (-li).  */
+#undef HAVE_LIBI
+
 /* Name of package */
 #undef PACKAGE
 
@@ -164,22 +137,3 @@
 /* Define if using the dmalloc debugging malloc package */
 #undef WITH_DMALLOC
 
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
-#undef ENABLE_NLS
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
diff --git a/src/actions.c b/src/actions.c
index 8b6a1c316..dc955e5ff 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1297,6 +1297,7 @@ e_act_desk_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry
    if (a->params) desk = atoi(a->params);
    e_desktops_goto(desk);
    return;
+   UN(o);
    UN(a);
    UN(data);
    UN(x);
diff --git a/src/keys.h b/src/keys.h
index c042309eb..f96bf7c47 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -7,4 +7,4 @@ void     e_keys_init(void);
 void     e_keys_grab(char *key, Ev_Key_Modifiers mods, int anymod);
 void     e_keys_ungrab(char *key, Ev_Key_Modifiers mods, int anymod);
 
-#endif;
+#endif
diff --git a/src/main.c b/src/main.c
index 4e0f703c5..db77cd061 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,6 +44,7 @@ wm_running_error(Display * d, XErrorEvent * ev)
 	fprintf(stderr, "A WM is alreayd running. no point running now is there?\n");
 	exit(1);
      }   
+   UN(d);
 }
 
 void setup(void);
@@ -60,7 +61,7 @@ setup(void)
 int
 main(int argc, char **argv)
 {
-   char *display = "0:0";
+   char *display = NULL;
    int   i;
 
    atexit(cb_exit);