2 files changed, 3 insertions, 2 deletions
diff --git a/waf b/waf
index 686fe2b..ef338a3 100755
--- a/waf
+++ b/waf
diff --git a/wscript b/wscript
index 9acf9bf..30dad46 100644
--- a/wscript
+++ b/wscript
@@ -21,6 +21,7 @@ out = 'build'
 
 def options(opt):
     autowaf.set_options(opt)
+    opt.load('compiler_cxx')
     opt.add_option('--patchage-install-name', type='string', default=APPNAME,
                     dest='patchage_install_name',
                     help="Patchage install name. [Default: '" + APPNAME + "']")
@@ -98,8 +99,8 @@ def configure(conf):
         autowaf.define(conf, 'PATCHAGE_BINLOC', 1)
 
     # Boost headers
-    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-    autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
 
     conf.env['PATCHAGE_VERSION'] = PATCHAGE_VERSION