diff --git a/avl/Makefile.am b/avl/Makefile.am
index ce190eb..842baac 100644
--- a/avl/Makefile.am
+++ b/avl/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = avl.h
 libiceavl_la_SOURCES = avl.c
 libiceavl_la_CFLAGS = @XIPH_CFLAGS@
 
-INCLUDES = -I$(srcdir)/../thread
+INCLUDES = -I$(srcdir)/..
 
 # SCCS stuff (for BitKeeper)
 GET = true
diff --git a/avl/avl.h b/avl/avl.h
index fc1ab5d..22caf85 100644
--- a/avl/avl.h
+++ b/avl/avl.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995 by Sam Rushing <rushing@nightmare.com>
  */
 
-/* $Id: avl.h,v 1.4 2003/03/06 02:35:12 brendan Exp $ */
+/* $Id: avl.h,v 1.5 2003/03/09 22:56:46 karl Exp $ */
 
 #ifndef __AVL_H
 #define __AVL_H
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 #ifndef NO_THREAD
-#include "thread.h"
+#include <thread/thread.h>
 #else
 #define thread_rwlock_create(x) do{}while(0)
 #define thread_rwlock_destroy(x) do{}while(0)
diff --git a/httpp/Makefile.am b/httpp/Makefile.am
index cb38fdf..453a76f 100644
--- a/httpp/Makefile.am
+++ b/httpp/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = httpp.h
 libicehttpp_la_SOURCES = httpp.c
 libicehttpp_la_CFLAGS = @XIPH_CFLAGS@
 
-INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../thread
+INCLUDES = -I$(srcdir)/..
 
 # SCCS stuff (for BitKeeper)
 GET = true
diff --git a/httpp/httpp.c b/httpp/httpp.c
index 629710d..138531e 100644
--- a/httpp/httpp.c
+++ b/httpp/httpp.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "avl.h"
+#include <avl/avl.h>
 #include "httpp.h"
 
 #ifdef _WIN32
diff --git a/httpp/httpp.h b/httpp/httpp.h
index e82edf3..9aa6f87 100644
--- a/httpp/httpp.h
+++ b/httpp/httpp.h
@@ -6,7 +6,7 @@
 #ifndef __HTTPP_H
 #define __HTTPP_H
 
-#include "avl.h"
+#include <avl/avl.h>
 
 #define HTTPP_VAR_PROTOCOL "__protocol"
 #define HTTPP_VAR_VERSION "__version"
diff --git a/net/Makefile.am b/net/Makefile.am
index d1441cb..358cc02 100644
--- a/net/Makefile.am
+++ b/net/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = resolver.h sock.h
 libicenet_la_SOURCES = sock.c resolver.c
 libicenet_la_CFLAGS = @XIPH_CFLAGS@
 
-INCLUDES = -I$(srcdir)/../thread
+INCLUDES = -I$(srcdir)/..
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/net/resolver.c b/net/resolver.c
index e3ab671..288fc9c 100644
--- a/net/resolver.c
+++ b/net/resolver.c
@@ -23,7 +23,7 @@
 #endif
 
 #ifndef NO_THREAD
-#include "thread.h"
+#include <thread/thread.h>
 #else
 #define thread_mutex_create(x) do{}while(0)
 #define thread_mutex_destroy(x) do{}while(0)
diff --git a/thread/Makefile.am b/thread/Makefile.am
index 028ddb4..7e87f55 100644
--- a/thread/Makefile.am
+++ b/thread/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = thread.h
 libicethread_la_SOURCES = thread.c
 libicethread_la_CFLAGS = @XIPH_CFLAGS@
 
-INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../log
+INCLUDES = -I$(srcdir)/..
 
 # SCCS stuff (for BitKeeper)
 GET = true
diff --git a/thread/thread.c b/thread/thread.c
index 4cd2869..fca021a 100644
--- a/thread/thread.c
+++ b/thread/thread.c
@@ -42,10 +42,10 @@
 
 #include <signal.h>
 
-#include "thread.h"
-#include "avl.h"
+#include <thread/thread.h>
+#include <avl/avl.h>
 #ifdef THREAD_DEBUG
-#include "log.h"
+#include <log/log.h>
 #endif
 
 #ifdef _WIN32