diff --git a/Makefile.am b/Makefile.am
index fff821a..073a0a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,5 +28,7 @@ libigloo_la_LIBADD = \
 
 pkgconfig_DATA = igloo.pc
 
+AM_CFLAGS = -I$(top_srcdir)/include
+
 static:
 	$(MAKE) all LDFLAGS="${LDFLAGS} -all-static"
diff --git a/avl/Makefile.am b/avl/Makefile.am
index fa28f35..b424982 100644
--- a/avl/Makefile.am
+++ b/avl/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libiceavl.la
 
 libiceavl_la_SOURCES = avl.c
 
-AM_CPPFLAGS = -I$(srcdir)/..
+AM_CFLAGS = -I$(top_srcdir)/include
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/avl/avl.c b/avl/avl.c
index ebcef2d..396deca 100644
--- a/avl/avl.c
+++ b/avl/avl.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../include/igloo/avl.h"
+#include <igloo/avl.h>
 
 igloo_avl_node *
 igloo_avl_node_new (void *        key,
diff --git a/avl/test.c b/avl/test.c
index e953e0b..3c97d16 100644
--- a/avl/test.c
+++ b/avl/test.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../include/igloo/avl.h"
+#include <igloo/avl.h>
 
 #ifdef _WIN32
 #define snprintf _snprintf
diff --git a/httpp/Makefile.am b/httpp/Makefile.am
index 6ced92b..6c1266a 100644
--- a/httpp/Makefile.am
+++ b/httpp/Makefile.am
@@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign
 noinst_LTLIBRARIES = libicehttpp.la
 
 libicehttpp_la_SOURCES = httpp.c encoding.c
-AM_CPPFLAGS = -I$(srcdir)/..
+
+AM_CFLAGS = -I$(top_srcdir)/include
 
 # SCCS stuff (for BitKeeper)
 GET = true
diff --git a/httpp/encoding.c b/httpp/encoding.c
index f62a041..c0f5f25 100644
--- a/httpp/encoding.c
+++ b/httpp/encoding.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "../include/igloo/encoding.h"
+#include <igloo/encoding.h>
 
 struct igloo_httpp_encoding_tag {
     size_t refc;
diff --git a/httpp/httpp.c b/httpp/httpp.c
index d6f3ebe..1290e11 100644
--- a/httpp/httpp.c
+++ b/httpp/httpp.c
@@ -38,8 +38,8 @@
 #include <strings.h>
 #endif
 
-#include "../include/igloo/avl.h"
-#include "../include/igloo/httpp.h"
+#include <igloo/avl.h>
+#include <igloo/httpp.h>
 
 #define MAX_HEADERS 32
 
diff --git a/httpp/test.c b/httpp/test.c
index a96381f..38c9f90 100644
--- a/httpp/test.c
+++ b/httpp/test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <avl/avl.h>
-#include "../include/igloo/httpp.h"
+#include <igloo/httpp.h>
 
 
 int main(int argc, char **argv)
diff --git a/include/igloo/avl.h b/include/igloo/avl.h
index efd71e0..44c4ccb 100644
--- a/include/igloo/avl.h
+++ b/include/igloo/avl.h
@@ -12,11 +12,11 @@
 extern "C" {
 #endif
 
-#include "config.h"
+#include <igloo/config.h>
 
 #define AVL_KEY_PRINTER_BUFLEN (256)
 
-#include "thread.h"
+#include <igloo/thread.h>
 
 typedef struct igloo_avl_node_tag {
   void *        key;
diff --git a/include/igloo/httpp.h b/include/igloo/httpp.h
index c6d0bcd..35e1ca6 100644
--- a/include/igloo/httpp.h
+++ b/include/igloo/httpp.h
@@ -27,7 +27,7 @@
 #ifndef _LIBIGLOO__HTTPP_H_
 #define _LIBIGLOO__HTTPP_H_
 
-#include "avl.h"
+#include <igloo/avl.h>
 
 #define igloo_HTTPP_VAR_PROTOCOL "__protocol"
 #define igloo_HTTPP_VAR_VERSION "__version"
diff --git a/include/igloo/sock.h b/include/igloo/sock.h
index ead3b4f..f75c604 100644
--- a/include/igloo/sock.h
+++ b/include/igloo/sock.h
@@ -28,7 +28,7 @@
 #ifndef _LIBIGLOO__SOCK_H_
 #define _LIBIGLOO__SOCK_H_
 
-#include "config.h"
+#include <igloo/config.h>
 
 #include <stdarg.h>
 
diff --git a/include/igloo/thread.h b/include/igloo/thread.h
index a39c4cb..9af9011 100644
--- a/include/igloo/thread.h
+++ b/include/igloo/thread.h
@@ -27,7 +27,7 @@
 #ifndef _LIBIGLOO__THREAD_H_
 #define _LIBIGLOO__THREAD_H_
 
-#include "config.h"
+#include <igloo/config.h>
 
 #include <pthread.h>
 
diff --git a/include/igloo/timing.h b/include/igloo/timing.h
index 607d4c7..490eb7f 100644
--- a/include/igloo/timing.h
+++ b/include/igloo/timing.h
@@ -28,7 +28,7 @@
 #ifndef _LIBIGLOO__TIMING_H_
 #define _LIBIGLOO__TIMING_H_
 
-#include "config.h"
+#include <igloo/config.h>
 
 #include <sys/types.h>
 #ifdef IGLOO_CTC_HAVE_INTTYPES_H
diff --git a/log/Makefile.am b/log/Makefile.am
index eecbdbb..e8ae264 100644
--- a/log/Makefile.am
+++ b/log/Makefile.am
@@ -8,6 +8,8 @@ noinst_LTLIBRARIES = libicelog.la
 
 libicelog_la_SOURCES = log.c
 
+AM_CFLAGS = -I$(top_srcdir)/include
+
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
 
diff --git a/log/log.c b/log/log.c
index db7b0ba..1203fd6 100644
--- a/log/log.c
+++ b/log/log.c
@@ -51,7 +51,7 @@
 #include <windows.h>
 #endif
 
-#include "../include/igloo/log.h"
+#include <igloo/log.h>
 
 #define LOG_MAXLOGS 25
 #define LOG_MAXLINELEN 1024
diff --git a/log/test.c b/log/test.c
index ac7ae1d..a1f021e 100644
--- a/log/test.c
+++ b/log/test.c
@@ -1,4 +1,4 @@
-#include "../include/igloo/log.h"
+#include <igloo/log.h>
 
 #define CATMODULE "test"
 
diff --git a/net/Makefile.am b/net/Makefile.am
index eaf962c..e39957d 100644
--- a/net/Makefile.am
+++ b/net/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libicenet.la
 
 libicenet_la_SOURCES = sock.c resolver.c
 
-AM_CPPFLAGS = -I$(srcdir)/..
+AM_CFLAGS = -I$(top_srcdir)/include
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/net/resolver.c b/net/resolver.c
index ac17dcd..409452a 100644
--- a/net/resolver.c
+++ b/net/resolver.c
@@ -42,7 +42,7 @@
 #endif
 
 #ifndef NO_THREAD
-#include "../include/igloo/thread.h"
+#include <igloo/thread.h>
 #else
 #define igloo_thread_mutex_create(x) do{}while(0)
 #define igloo_thread_mutex_destroy(x) do{}while(0)
@@ -50,8 +50,8 @@
 #define igloo_thread_mutex_unlock(x) do{}while(0)
 #endif
 
-#include "../include/igloo/resolver.h"
-#include "../include/igloo/sock.h"
+#include <igloo/resolver.h>
+#include <igloo/sock.h>
 
 /* internal function */
 
diff --git a/net/sock.c b/net/sock.c
index 98f56da..cfb14f2 100644
--- a/net/sock.c
+++ b/net/sock.c
@@ -56,8 +56,8 @@
 #include <winsock2.h>
 #endif
 
-#include "../include/igloo/sock.h"
-#include "../include/igloo/resolver.h"
+#include <igloo/sock.h>
+#include <igloo/resolver.h>
 
 /* for older C libraries */
 #ifndef AI_NUMERICSERV
diff --git a/net/test_resolver.c b/net/test_resolver.c
index bdfe099..3a43fa7 100644
--- a/net/test_resolver.c
+++ b/net/test_resolver.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../include/igloo/resolver.h"
+#include <igloo/resolver.h>
 
 int main()
 {
diff --git a/thread/Makefile.am b/thread/Makefile.am
index c665807..69bbb9c 100644
--- a/thread/Makefile.am
+++ b/thread/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libicethread.la
 
 libicethread_la_SOURCES = thread.c
 
-AM_CPPFLAGS = -I$(srcdir)/..
+AM_CFLAGS = -I$(top_srcdir)/include
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/thread/thread.c b/thread/thread.c
index 44a5f94..56e4598 100644
--- a/thread/thread.c
+++ b/thread/thread.c
@@ -47,10 +47,10 @@
 
 #include <signal.h>
 
-#include "../include/igloo/thread.h"
-#include "../include/igloo/avl.h"
+#include <igloo/thread.h>
+#include <igloo/avl.h>
 #ifdef THREAD_DEBUG
-#include "../include/igloo/log.h"
+#include <igloo/log.h>
 #endif
 
 #ifdef _WIN32
diff --git a/timing/Makefile.am b/timing/Makefile.am
index bc0907e..cf0034f 100644
--- a/timing/Makefile.am
+++ b/timing/Makefile.am
@@ -8,6 +8,8 @@ noinst_LTLIBRARIES = libicetiming.la
 
 libicetiming_la_SOURCES = timing.c
 
+AM_CFLAGS = -I$(top_srcdir)/include
+
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
 
diff --git a/timing/timing.c b/timing/timing.c
index 5e74c0d..95b3f91 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -59,7 +59,7 @@
 #include <sys/timeb.h>
 #endif
 
-#include "../include/igloo/timing.h"
+#include <igloo/timing.h>
 
 /* 
  * Returns milliseconds no matter what.