diff --git a/Makefile.am b/Makefile.am
index ffb79b0..fff821a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,16 @@ SUBDIRS = avl httpp log net thread timing
 
 lib_LTLIBRARIES = libigloo.la
 
-pkginclude_HEADERS = include/igloo.h
+pkginclude_HEADERS = \
+    include/igloo/avl.h \
+    include/igloo/encoding.h \
+    include/igloo/httpp.h \
+    include/igloo/igloo.h \
+    include/igloo/log.h \
+    include/igloo/resolver.h \
+    include/igloo/sock.h \
+    include/igloo/thread.h \
+    include/igloo/timing.h
 
 libigloo_la_SOURCES = src/libigloo.c
 libigloo_la_LIBADD = \
diff --git a/avl/Makefile.am b/avl/Makefile.am
index bc3a52b..fa28f35 100644
--- a/avl/Makefile.am
+++ b/avl/Makefile.am
@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO avl.dsp test.c
 
 noinst_LTLIBRARIES = libiceavl.la
-pkginclude_HEADERS = avl.h
 
 libiceavl_la_SOURCES = avl.c
 
diff --git a/avl/avl.c b/avl/avl.c
index 4499703..d161e0c 100644
--- a/avl/avl.c
+++ b/avl/avl.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "avl.h"
+#include "../include/igloo/avl.h"
 
 igloo_avl_node *
 igloo_avl_node_new (void *        key,
diff --git a/avl/test.c b/avl/test.c
index 6c074fb..e953e0b 100644
--- a/avl/test.c
+++ b/avl/test.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "avl.h"
+#include "../include/igloo/avl.h"
 
 #ifdef _WIN32
 #define snprintf _snprintf
diff --git a/httpp/Makefile.am b/httpp/Makefile.am
index b09a701..6ced92b 100644
--- a/httpp/Makefile.am
+++ b/httpp/Makefile.am
@@ -3,7 +3,6 @@
 AUTOMAKE_OPTIONS = foreign
 
 noinst_LTLIBRARIES = libicehttpp.la
-pkginclude_HEADERS = httpp.h encoding.h
 
 libicehttpp_la_SOURCES = httpp.c encoding.c
 AM_CPPFLAGS = -I$(srcdir)/..
diff --git a/httpp/encoding.c b/httpp/encoding.c
index c427956..f62a041 100644
--- a/httpp/encoding.c
+++ b/httpp/encoding.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "encoding.h"
+#include "../include/igloo/encoding.h"
 
 struct igloo_httpp_encoding_tag {
     size_t refc;
diff --git a/httpp/httpp.c b/httpp/httpp.c
index 6381575..0314ba6 100644
--- a/httpp/httpp.c
+++ b/httpp/httpp.c
@@ -38,8 +38,8 @@
 #include <strings.h>
 #endif
 
-#include <avl/avl.h>
-#include "httpp.h"
+#include "../include/igloo/avl.h"
+#include "../include/igloo/httpp.h"
 
 #define MAX_HEADERS 32
 
diff --git a/httpp/test.c b/httpp/test.c
index 158fa87..d6bfc0e 100644
--- a/httpp/test.c
+++ b/httpp/test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <avl/avl.h>
-#include "httpp.h"
+#include "../include/igloo/httpp.h"
 
 
 int main(int argc, char **argv)
diff --git a/avl/avl.h b/include/igloo/avl.h
similarity index 99%
rename from avl/avl.h
rename to include/igloo/avl.h
index 109c981..cd603a3 100644
--- a/avl/avl.h
+++ b/include/igloo/avl.h
@@ -15,7 +15,7 @@ extern "C" {
 #define AVL_KEY_PRINTER_BUFLEN (256)
 
 #ifndef NO_THREAD
-#include "thread/thread.h"
+#include "thread.h"
 #else
 #define thread_rwlock_create(x) do{}while(0)
 #define igloo_thread_rwlock_destroy(x) do{}while(0)
diff --git a/httpp/encoding.h b/include/igloo/encoding.h
similarity index 100%
rename from httpp/encoding.h
rename to include/igloo/encoding.h
diff --git a/httpp/httpp.h b/include/igloo/httpp.h
similarity index 99%
rename from httpp/httpp.h
rename to include/igloo/httpp.h
index fa22aa0..248eda7 100644
--- a/httpp/httpp.h
+++ b/include/igloo/httpp.h
@@ -27,7 +27,7 @@
 #ifndef _LIBIGLOO__HTTPP_H_
 #define _LIBIGLOO__HTTPP_H_
 
-#include <avl/avl.h>
+#include "avl.h"
 
 #define igloo_HTTPP_VAR_PROTOCOL "__protocol"
 #define igloo_HTTPP_VAR_VERSION "__version"
diff --git a/include/igloo.h b/include/igloo/igloo.h
similarity index 100%
rename from include/igloo.h
rename to include/igloo/igloo.h
diff --git a/log/log.h b/include/igloo/log.h
similarity index 100%
rename from log/log.h
rename to include/igloo/log.h
diff --git a/net/resolver.h b/include/igloo/resolver.h
similarity index 100%
rename from net/resolver.h
rename to include/igloo/resolver.h
diff --git a/net/sock.h b/include/igloo/sock.h
similarity index 100%
rename from net/sock.h
rename to include/igloo/sock.h
diff --git a/thread/thread.h b/include/igloo/thread.h
similarity index 100%
rename from thread/thread.h
rename to include/igloo/thread.h
diff --git a/timing/timing.h b/include/igloo/timing.h
similarity index 100%
rename from timing/timing.h
rename to include/igloo/timing.h
diff --git a/log/Makefile.am b/log/Makefile.am
index 8d7e6eb..eecbdbb 100644
--- a/log/Makefile.am
+++ b/log/Makefile.am
@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = test.c
 
 noinst_LTLIBRARIES = libicelog.la
-pkginclude_HEADERS = log.h
 
 libicelog_la_SOURCES = log.c
 
diff --git a/log/log.c b/log/log.c
index b802e3c..db7b0ba 100644
--- a/log/log.c
+++ b/log/log.c
@@ -51,7 +51,7 @@
 #include <windows.h>
 #endif
 
-#include "log.h"
+#include "../include/igloo/log.h"
 
 #define LOG_MAXLOGS 25
 #define LOG_MAXLINELEN 1024
diff --git a/log/test.c b/log/test.c
index 8554f5f..ac7ae1d 100644
--- a/log/test.c
+++ b/log/test.c
@@ -1,4 +1,4 @@
-#include "log.h"
+#include "../include/igloo/log.h"
 
 #define CATMODULE "test"
 
diff --git a/net/Makefile.am b/net/Makefile.am
index 26b3f9b..eaf962c 100644
--- a/net/Makefile.am
+++ b/net/Makefile.am
@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO test_resolver.c
 
 noinst_LTLIBRARIES = libicenet.la
-pkginclude_HEADERS = resolver.h sock.h
 
 libicenet_la_SOURCES = sock.c resolver.c
 
diff --git a/net/resolver.c b/net/resolver.c
index 7362183..4381b68 100644
--- a/net/resolver.c
+++ b/net/resolver.c
@@ -42,7 +42,7 @@
 #endif
 
 #ifndef NO_THREAD
-#include <thread/thread.h>
+#include "../include/igloo/thread.h"
 #else
 #define thread_mutex_create(x) do{}while(0)
 #define igloo_thread_mutex_destroy(x) do{}while(0)
@@ -50,8 +50,8 @@
 #define thread_mutex_unlock(x) do{}while(0)
 #endif
 
-#include "resolver.h"
-#include "sock.h"
+#include "../include/igloo/resolver.h"
+#include "../include/igloo/sock.h"
 
 /* internal function */
 
diff --git a/net/sock.c b/net/sock.c
index f7b4531..98f56da 100644
--- a/net/sock.c
+++ b/net/sock.c
@@ -56,8 +56,8 @@
 #include <winsock2.h>
 #endif
 
-#include "sock.h"
-#include "resolver.h"
+#include "../include/igloo/sock.h"
+#include "../include/igloo/resolver.h"
 
 /* for older C libraries */
 #ifndef AI_NUMERICSERV
diff --git a/net/test_resolver.c b/net/test_resolver.c
index 8a87545..bdfe099 100644
--- a/net/test_resolver.c
+++ b/net/test_resolver.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "resolver.h"
+#include "../include/igloo/resolver.h"
 
 int main()
 {
diff --git a/thread/Makefile.am b/thread/Makefile.am
index bd9a26d..c665807 100644
--- a/thread/Makefile.am
+++ b/thread/Makefile.am
@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO
 
 noinst_LTLIBRARIES = libicethread.la
-pkginclude_HEADERS = thread.h
 
 libicethread_la_SOURCES = thread.c
 
diff --git a/thread/thread.c b/thread/thread.c
index d1e2656..c29fc70 100644
--- a/thread/thread.c
+++ b/thread/thread.c
@@ -47,10 +47,10 @@
 
 #include <signal.h>
 
-#include <thread/thread.h>
-#include <avl/avl.h>
+#include "../include/igloo/thread.h"
+#include "../include/igloo/avl.h"
 #ifdef THREAD_DEBUG
-#include <log/log.h>
+#include "../include/igloo/log.h"
 #endif
 
 #ifdef _WIN32
diff --git a/timing/Makefile.am b/timing/Makefile.am
index 04aeaeb..bc0907e 100644
--- a/timing/Makefile.am
+++ b/timing/Makefile.am
@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = BUILDING COPYING README TODO
 
 noinst_LTLIBRARIES = libicetiming.la
-pkginclude_HEADERS = timing.h
 
 libicetiming_la_SOURCES = timing.c
 
diff --git a/timing/timing.c b/timing/timing.c
index 76c202b..5e74c0d 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -59,7 +59,7 @@
 #include <sys/timeb.h>
 #endif
 
-#include "timing.h"
+#include "../include/igloo/timing.h"
 
 /* 
  * Returns milliseconds no matter what.