diff --git a/wscript b/wscript
index 0f0ea36..025e481 100644
--- a/wscript
+++ b/wscript
@@ -48,7 +48,7 @@
         # vnum = "1.0.0",
         features=['cxx', 'cxxshlib'],
         source =  bld.path.ant_glob(['src/**/*.cpp', 'src/**/*.proto']),
-        use = 'BOOST NDN_CXX',
+        use = 'BOOST NDN_CXX LOG4CXX',
         includes = ['src', '.'],
         export_includes=['src', '.'],
         )
@@ -57,23 +57,18 @@
     if bld.env["_TESTS"]:
         bld.recurse('tests')
 
-    if bld.get_define("HAVE_LOG4CXX"):
-        libsync.use += ' LOG4CXX'
-        if bld.env["_TESTS"]:
-            unittests.use += ' LOG4CXX'
-
     bld.install_files(
         dest = "%s/ChronoSync" % bld.env['INCLUDEDIR'],
-        files = bld.path.ant_glob(['src/**/*.h']),
+        files = bld.path.ant_glob(['src/**/*.hpp', 'src/**/*.h', 'common.hpp']),
         cwd = bld.path.find_dir("src"),
-        relative_trick = True,
+        relative_trick = False,
         )
 
     bld.install_files(
         dest = "%s/ChronoSync" % bld.env['INCLUDEDIR'],
-        files = bld.path.get_bld().ant_glob(['src/**/*.h']),
+        files = bld.path.get_bld().ant_glob(['src/**/*.hpp', 'src/**/*.h', 'common.hpp', 'config.hpp']),
         cwd = bld.path.get_bld().find_dir("src"),
-        relative_trick = True,
+        relative_trick = False,
         )
 
     pc = bld(