diff --git a/src/device.ml b/src/device.ml
index 51bb4b416..e09d59d10 100644
--- a/src/device.ml
+++ b/src/device.ml
@@ -13,7 +13,7 @@
  *)
 open Printf
 
-open Stringext
+open Xstringext
 open Hashtblext
 open Pervasiveext
 open Listext
diff --git a/src/device_common.ml b/src/device_common.ml
index 4c14b5870..de8c2341c 100644
--- a/src/device_common.ml
+++ b/src/device_common.ml
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *)
 open Printf
-open Stringext
+open Xstringext
 open Hashtblext
 open Pervasiveext
 
diff --git a/src/domain.ml b/src/domain.ml
index 38c83360c..780cd8a4c 100644
--- a/src/domain.ml
+++ b/src/domain.ml
@@ -14,7 +14,7 @@
 (** Functions relating to Xen domains *)
 
 open Printf
-open Stringext
+open Xstringext
 open Listext
 open Pervasiveext
 
diff --git a/src/hotplug.ml b/src/hotplug.ml
index 5f1014863..325b6f759 100644
--- a/src/hotplug.ml
+++ b/src/hotplug.ml
@@ -13,7 +13,7 @@
  *)
 
 open Printf
-open Stringext
+open Xstringext
 
 open Device_common
 
diff --git a/src/memory_breakdown.ml b/src/memory_breakdown.ml
index a82befc8c..e549e9ace 100644
--- a/src/memory_breakdown.ml
+++ b/src/memory_breakdown.ml
@@ -13,7 +13,7 @@
  *)
 
 open Listext
-open Stringext
+open Xstringext
 open Unixext
 
 (** Command-line tool for sampling host and guest memory usage. *)
diff --git a/src/xenguestHelper.ml b/src/xenguestHelper.ml
index c25e1dbf1..419df622a 100644
--- a/src/xenguestHelper.ml
+++ b/src/xenguestHelper.ml
@@ -145,7 +145,7 @@ let receive_success ?(debug_callback=(fun s -> debug "%s" s)) cnx =
 	| Error x ->
 		(* These error strings match those in xenguest_stubs.c *)
 		begin
-			match Stringext.String.split ~limit:3 ' ' x with
+			match Xstringext.String.split ~limit:3 ' ' x with
 			| [ "hvm_build"         ; code; msg ] -> raise (Domain_builder_error       ("hvm_build", int_of_string code, msg))
 			| [ "xc_dom_allocate"   ; code; msg ] -> raise (Xc_dom_allocate_failure    (int_of_string code, msg))
 			| [ "xc_dom_linux_build"; code; msg ] -> raise (Xc_dom_linux_build_failure (int_of_string code, msg))
diff --git a/src/xenvmlib.ml b/src/xenvmlib.ml
index 960384d92..e9f95167d 100644
--- a/src/xenvmlib.ml
+++ b/src/xenvmlib.ml
@@ -15,7 +15,7 @@
 
 (** xenvm library *)
 
-open Stringext
+open Xstringext
 
 type answer = Ok | Error of string | Msg of string | Unknown of string