diff --git a/genkeymap/Makefile.am b/genkeymap/Makefile.am
index 3590b7d7..78b519bf 100644
--- a/genkeymap/Makefile.am
+++ b/genkeymap/Makefile.am
@@ -1,18 +1,8 @@
 
-AM_CFLAGS = \
-  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-  -DXRDP_SBIN_PATH=\"${sbindir}\" \
-  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-  -DXRDP_PID_PATH=\"${localstatedir}/run\"
-
-INCLUDES = \
-  -I$(top_srcdir)/common
-
 bin_PROGRAMS = \
   xrdp-genkeymap
 
 xrdp_genkeymap_SOURCES = genkeymap.c
 
 xrdp_genkeymap_LDADD = \
-  $(top_srcdir)/common/libcommon.la \
   -lX11
diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c
index cb4e2408..f6092245 100644
--- a/genkeymap/genkeymap.c
+++ b/genkeymap/genkeymap.c
@@ -1,10 +1,8 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * main.cc
+ * genkeymap.c
  * Copyright (C) Ádám Wallner 2008 <wallner@bitbaro.hu>
  * 
- * main.cc is free software.
- * 
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)