diff --git a/bazaar/PolyXML/ClassFactory.h b/bazaar/PolyXML/ClassFactory.h
index 70088098f..3dc13d08c 100644
--- a/bazaar/PolyXML/ClassFactory.h
+++ b/bazaar/PolyXML/ClassFactory.h
@@ -1,7 +1,7 @@
 #ifndef _ClassFactory_h_
 #define _ClassFactory_h_
 
-#include <Core/Core.h>
+#include <Draw/Draw.h>
 
 NAMESPACE_UPP;
 
diff --git a/bazaar/PolyXML/PolyXML.cpp b/bazaar/PolyXML/PolyXML.cpp
index 14cc1825a..25e1f6aca 100644
--- a/bazaar/PolyXML/PolyXML.cpp
+++ b/bazaar/PolyXML/PolyXML.cpp
@@ -1 +1 @@
-#include <Core/Core.h>
+#include "PolyXML.h"
diff --git a/bazaar/PolyXML/PolyXML.upp b/bazaar/PolyXML/PolyXML.upp
index 37cd1b30a..766657527 100644
--- a/bazaar/PolyXML/PolyXML.upp
+++ b/bazaar/PolyXML/PolyXML.upp
@@ -1,5 +1,5 @@
 uses
-	Core;
+	Draw;
 
 file
 	ClassFactory.h,
diff --git a/bazaar/PolyXML/init b/bazaar/PolyXML/init
index ef1ddbad7..27ae19966 100644
--- a/bazaar/PolyXML/init
+++ b/bazaar/PolyXML/init
@@ -1,4 +1,4 @@
 #ifndef _PolyXML_icpp_init_stub
 #define _PolyXML_icpp_init_stub
-#include "Core/init"
+#include "Draw/init"
 #endif