diff --git a/utils/pgsql2sqlite/build.py b/utils/pgsql2sqlite/build.py
index c342fefb2..e29eb5752 100644
--- a/utils/pgsql2sqlite/build.py
+++ b/utils/pgsql2sqlite/build.py
@@ -35,8 +35,13 @@ source = Split(
     """
     )
 
-headers = ['#plugins/input/postgis'] + env['CPPPATH'] 
+program_env['CXXFLAGS'] = copy(env['LIBMAPNIK_CXXFLAGS'])
 
+if env['HAS_CAIRO']:
+    program_env.PrependUnique(CPPPATH=env['CAIROMM_CPPPATHS'])
+    program_env.Append(CXXFLAGS = '-DHAVE_CAIRO')
+
+program_env.PrependUnique(CPPPATH=['#plugins/input/postgis'])
 
 libraries = []
 boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
@@ -49,7 +54,7 @@ if env['SQLITE_LINKFLAGS']:
 if env['RUNTIME_LINK'] == 'static':
     libraries.extend(['ldap','pam','ssl','crypto','krb5'])
 
-pgsql2sqlite = program_env.Program('pgsql2sqlite', source, CPPPATH=headers, LIBS=libraries, LINKFLAGS=linkflags)
+pgsql2sqlite = program_env.Program('pgsql2sqlite', source, LIBS=libraries, LINKFLAGS=linkflags)
 Depends(pgsql2sqlite, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
 
 if 'uninstall' not in COMMAND_LINE_TARGETS: