diff --git a/bazaar/plugin/gdal/gdal.h b/bazaar/plugin/gdal/gdal.h
index 37d605046..61b28aec9 100644
--- a/bazaar/plugin/gdal/gdal.h
+++ b/bazaar/plugin/gdal/gdal.h
@@ -4,8 +4,8 @@
 #include <Draw/Draw.h>
 #include <Geom/Geom.h>
 
-#include <gdal/gcore/gdal_priv.h>
-#include <gdal/port/cpl_conv.h>
+#include <plugin/gdal/gcore/gdal_priv.h>
+#include <plugin/gdal/port/cpl_conv.h>
 
 class GDALDriver;
 class GDALDataset;
diff --git a/bazaar/plugin/gdal/init b/bazaar/plugin/gdal/init
index 62f59f0c8..45ecacb49 100644
--- a/bazaar/plugin/gdal/init
+++ b/bazaar/plugin/gdal/init
@@ -1,3 +1,3 @@
-#ifndef _gdal_icpp_init_stub
-#define _gdal_icpp_init_stub
+#ifndef _plugin_gdal_icpp_init_stub
+#define _plugin_gdal_icpp_init_stub
 #endif