diff --git a/nf-hishape-user.cc b/nf-hishape-user.cc
index 5016dc7..0692b24 100644
--- a/nf-hishape-user.cc
+++ b/nf-hishape-user.cc
@@ -11,21 +11,14 @@
  * limitations under the License.
  * 
  * Project: nf-HiShape
- * File: nf-hishape-user.c
+ * File: nf-hishape-user.cc
  * Purpose: userland tool for the nf-HiShape kernel module
- * Responsible: Matthias Reif
- * Primary Repository: https://svn.iupr.org/projects/nf-HiShape
- * Web Sites: www.iupr.org, www.dfki.de
+ * Responsible: Markus Goldstein
+ * Primary Repository: https://github.com/Markus-Go/nf-hishape
+ * Web Sites: www.madm.dfki.de, www.goldiges.de
  */
 
 
-#include <getopt.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <iostream>
-#include <string>
-
 #include "nf-hishape_util.h"
 
 void printUsage(int argc, char *argv[]);
diff --git a/nf-hishape.c b/nf-hishape.c
index 752a560..599fe76 100644
--- a/nf-hishape.c
+++ b/nf-hishape.c
@@ -13,9 +13,9 @@
  * Project: nf-HiShape
  * File: nf-hishape.c
  * Purpose: kernel module for simple but high performance traffic shaping
- * Responsible: Matthias Reif
- * Primary Repository: https://svn.iupr.org/projects/nf-HiShape
- * Web Sites: www.iupr.org, www.dfki.de
+ * Responsible: Markus Goldstein
+ * Primary Repository: https://github.com/Markus-Go/nf-hishape 
+ * Web Sites: www.madm.dfki.de, www.goldiges.de
  */
 
 #include <linux/kernel.h>
diff --git a/nf-hishape.h b/nf-hishape.h
index e8fdf4a..21c87b0 100644
--- a/nf-hishape.h
+++ b/nf-hishape.h
@@ -13,9 +13,9 @@
  * Project: nf-HiShape
  * File: nf-hishape.h
  * Purpose: header file for the nf-HiShape kernel module and its library/userland tool
- * Responsible: Matthias Reif
- * Primary Repository: https://svn.iupr.org/projects/nf-HiShape
- * Web Sites: www.iupr.org, www.dfki.de
+ * Responsible: Markus Goldstein
+ * Primary Repository: https://github.com/Markus-Go/nf-hishape
+ * Web Sites: www.madm.dfki.de, www.goldiges.de
  */
 
 #include <linux/ioctl.h>
diff --git a/nf-hishape.man b/nf-hishape.man
index 44e776b..9966dbb 100644
--- a/nf-hishape.man
+++ b/nf-hishape.man
@@ -70,9 +70,9 @@ print the help message
 .br
 \fRnf-hishape -f 192.168.2.1 -t 192.168.2.1 -l 100
 .SH AUTHOR
-Written by Matthias Reif and Emmanuel Teguetio
+Written by Matthias Reif, Emmanuel Teguetio and Markus Goldstein
 .SH REPORTING BUGS
-Report bugs to <matthias.reif@iupr.dfki.de>.
+Report bugs to <Markus-Go@users.noreply.github.com>.
 .SH COPYRIGHT
 Copyright 2007-2008 Deutsches Forschungszentrum fuer Kuenstliche Intelligenz
 or its licensors, as applicable.
diff --git a/nf-hishape_util.cc b/nf-hishape_util.cc
index b380924..e25b70c 100644
--- a/nf-hishape_util.cc
+++ b/nf-hishape_util.cc
@@ -11,17 +11,13 @@
  * limitations under the License.
  * 
  * Project: nf-HiShape
- * File: nf-hishape_util.c
+ * File: nf-hishape_util.cc
  * Purpose: library of the userland tool for the nf-hishape kernel module
- * Responsible: Matthias Reif
- * Primary Repository: https://svn.iupr.org/projects/nf-HiShape
- * Web Sites: www.iupr.org, www.dfki.de
+ * Responsible: Markus Goldstein
+ * Primary Repository: https://github.com/Markus-Go/nf-hishape
+ * Web Sites: www.madm.dfki.de, www.goldiges.de
  */
 
-
-#include <iostream>
-#include <stdio.h>
-
 #include "nf-hishape_util.h"
 
 using namespace std;
diff --git a/nf-hishape_util.h b/nf-hishape_util.h
index bbb7c6a..9e62d1b 100644
--- a/nf-hishape_util.h
+++ b/nf-hishape_util.h
@@ -13,9 +13,9 @@
  * Project: nf-HiShape
  * File: nf-hishape_util.h
  * Purpose: header file containing functions for interacting with the nf-hishape kernel module 
- * Responsible: Matthias Reif
- * Primary Repository: https://svn.iupr.org/projects/nf-HiShape
- * Web Sites: www.iupr.org, www.dfki.de
+ * Responsible: Markus Goldstein
+ * Primary Repository: https://github.com/Markus-Go/nf-hishape
+ * Web Sites: www.madm.dfki.de, www.goldiges.de
  */
  
 #ifndef TEST_H_
@@ -31,6 +31,12 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
+#include <iostream>
+#include <unistd.h>
+#include <stdio.h>
+#include <getopt.h>
+#include <stdlib.h>
+
 
 #include "nf-hishape.h"