diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..0163fc4e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+COPYING
+INSTALL
+Makefile
+Makefile.in
+NEWS
+aclocal.m4
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+depcomp
+install-sh
+libtool
+missing
+mkinstalldirs
+stamp-h1
diff --git a/reconf b/autogen.sh
similarity index 100%
rename from reconf
rename to autogen.sh
diff --git a/configure.in b/configure.ac
similarity index 99%
rename from configure.in
rename to configure.ac
index ac74f10f..1f7ae2ba 100644
--- a/configure.in
+++ b/configure.ac
@@ -142,7 +142,7 @@ dnl avoid -lnsl checks, if we already have the functions which are
 dnl usually in libnsl
 
 unset ac_cv_func_yp_get_default_domain
-AC_CHECK_FUNC(yp_get_default_domain, [ tinyproxy_no_nsl_checks=yes ], [ ])
+AC_CHECK_FUNC(yp_get_default_domain, [ tinyproxy_no_nsl_checks=yes ])
 unset ac_cv_func_yp_get_default_domain
 
 if test "$tinyproxy_no_nsl_checks" != "yes"; then
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000..71605d56
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+report.sh
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..0d0ee5c5
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,8 @@
+.deps
+.libs
+Makefile
+Makefile.in
+grammar.c
+grammar.h
+scanner.c
+tinyproxy
diff --git a/src/Makefile.am b/src/Makefile.am
index 25f21d96..5edabb85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,6 +47,3 @@ EXTRA_tinyproxy_SOURCES = grammar.h
 scanner.c: scanner.l grammar.h
 	$(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@
 
-clean:
-	rm -f *.da
-	rm -f gmon.out
\ No newline at end of file
diff --git a/src/scanner.l b/src/scanner.l
index 0f4cf292..7d5f9f45 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -71,7 +71,6 @@ static struct keyword keywords[] = {
 
 #define MAX_REGEXP_LEN	1024
 
-unsigned int yylineno = 1;
 char tiny_buf[MAX_REGEXP_LEN];
 char *tiny_str;
 
diff --git a/src/sock.c b/src/sock.c
index 5801a281..d5e8f596 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -155,7 +155,7 @@ int listen_sock(uint16_t port, socklen_t *addrlen)
 char *getpeer_ip(int fd, char *ipaddr)
 {
 	struct sockaddr_in name;
-	size_t namelen = sizeof(name);
+	socklen_t namelen = sizeof(name);
 
 	assert(fd >= 0);
 	assert(ipaddr != NULL);
@@ -183,7 +183,7 @@ char *getpeer_ip(int fd, char *ipaddr)
 char *getpeer_string(int fd, char *string)
 {
 	struct sockaddr_in name;
-	size_t namelen = sizeof(name);
+	socklen_t namelen = sizeof(name);
 	struct hostent *peername;
 
 	assert(fd >= 0);
diff --git a/src/utils.c b/src/utils.c
index 0954bc46..80948b25 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -35,21 +35,21 @@
 void *debugging_calloc(size_t nmemb, size_t size, const char *file, unsigned long line)
 {
 	void *ptr = calloc(nmemb, size);
-	fprintf(stderr, "{calloc: %p:%u x %u} %s:%lu\n", ptr, nmemb, size, file, line);
+	fprintf(stderr, "{calloc: %p:%zu x %zu} %s:%lu\n", ptr, nmemb, size, file, line);
 	return ptr;
 }
 
 void *debugging_malloc(size_t size, const char *file, unsigned long line)
 {
 	void *ptr = malloc(size);
-	fprintf(stderr, "{malloc: %p:%u} %s:%lu\n", ptr, size, file, line);
+	fprintf(stderr, "{malloc: %p:%zu} %s:%lu\n", ptr, size, file, line);
 	return ptr;
 }
 
 void *debugging_realloc(void *ptr, size_t size, const char *file, unsigned long line)
 {
 	void *newptr = realloc(ptr, size);
-	fprintf(stderr, "{realloc: %p -> %p:%u} %s:%lu\n", ptr, newptr, size, file, line);
+	fprintf(stderr, "{realloc: %p -> %p:%zu} %s:%lu\n", ptr, newptr, size, file, line);
 	return newptr;
 }