diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f8f718b..d874417 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Device control library change log
 =================================
 
+4.0.0
+-----
+
+  * CHANGED: Build files updated to support new "xcommon" behaviour in xwaf.
+
 3.2.4
 -----
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 7952425..2f66d41 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -101,7 +101,7 @@ pipeline {
       updateViewfiles()
     }
     cleanup {
-      cleanWs()
+      xcoreCleanSandbox()
     }
   }
 }
diff --git a/lib_device_control/LICENSE.txt b/lib_device_control/LICENSE.txt
index 1dfa462..8db0c35 100644
--- a/lib_device_control/LICENSE.txt
+++ b/lib_device_control/LICENSE.txt
@@ -1,6 +1,6 @@
 Software Release License Agreement
 
-Copyright (c) 2016-2018, XMOS, All rights reserved.
+Copyright (c) 2016-2019, XMOS, All rights reserved.
 
 BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software.
 
diff --git a/lib_device_control/module_build_info b/lib_device_control/module_build_info
index a58eddc..749ad44 100644
--- a/lib_device_control/module_build_info
+++ b/lib_device_control/module_build_info
@@ -1,10 +1,16 @@
-VERSION = 3.2.4
+VERSION = 4.0.0
 
-DEPENDENT_MODULES = lib_xassert(>=3.0.1) lib_logging(>=2.1.1)
+DEPENDENT_MODULES = lib_xassert(>=4.0.0) \
+                    lib_logging(>=3.0.0)
 
-MODULE_XCC_FLAGS = $(XCC_FLAGS) -Os
+MODULE_XCC_FLAGS = $(XCC_FLAGS) \
+                   -Os
 
-INCLUDE_DIRS = api src
+OPTIONAL_HEADERS +=
+
+EXPORT_INCLUDE_DIRS = api
+
+INCLUDE_DIRS = $(EXPORT_INCLUDE_DIRS) \
+               src
 
-# Ignore host dir
 SOURCE_DIRS = src
diff --git a/lib_device_control/wscript b/lib_device_control/wscript
deleted file mode 100644
index 8277e09..0000000
--- a/lib_device_control/wscript
+++ /dev/null
@@ -1,94 +0,0 @@
-import os.path
-
-
-def create_list_from_make_flag(bld, list_of_flags):
-    for i, flag in enumerate(list_of_flags):
-        if flag.startswith('$('):
-            for f in bld.env[flag.strip('$()')]:
-                list_of_flags.insert(i, f)
-                i += 1
-            list_of_flags.remove(flag)
-    return list_of_flags
-
-
-def create_list_of_strings(whitespace_seperated_list):
-    list_of_strings = whitespace_seperated_list.split(' ')
-    for item in list_of_strings:
-        item = "'{}'".format(item)
-    return list_of_strings
-
-
-def read_module_build_info(bld):
-    with open(os.path.join(bld.path.abspath(), 'module_build_info')) as file:
-        module_build_info = {}
-        for line in file.readlines():
-            line = line.strip()
-            if line and not line.startswith('#'):
-                key, value = line.split('=', 1)
-                module_build_info[key.strip(' +')] = value.strip()
-
-        try:
-            module_build_info['OPTIONAL_HEADERS'] = (
-                create_list_of_strings(module_build_info['OPTIONAL_HEADERS']))
-        except KeyError:
-            pass
-
-        try:
-            module_build_info['DEPENDENT_MODULES'] = (
-                create_list_of_strings(module_build_info['DEPENDENT_MODULES']))
-        except KeyError:
-            pass
-
-        try:
-            module_build_info['MODULE_XCC_FLAGS'] = (
-                create_list_from_make_flag(bld,
-                    create_list_of_strings(module_build_info['MODULE_XCC_FLAGS'])))
-        except KeyError:
-            pass
-
-        try:
-            module_build_info['MODULE_XCC_XC_FLAGS'] = (
-                create_list_from_make_flag(bld,
-                    create_list_of_strings(module_build_info['MODULE_XCC_XC_FLAGS'])))
-        except KeyError:
-            pass
-
-        try:
-            module_build_info['MODULE_XCC_C_FLAGS'] = (
-                create_list_from_make_flag(bld,
-                    create_list_of_strings(module_build_info['MODULE_XCC_C_FLAGS'])))
-        except KeyError:
-            pass
-
-        try:
-            module_build_info['MODULE_XCC_CPP_FLAGS'] = (
-                create_list_from_make_flag(bld,
-                    create_list_of_strings(module_build_info['MODULE_XCC_CPP_FLAGS'])))
-        except KeyError:
-            pass
-
-        try:
-            module_build_info['MODULE_XCC_ASM_FLAGS'] = (
-                create_list_from_make_flag(bld,
-                    create_list_of_strings(module_build_info['MODULE_XCC_ASM_FLAGS'])))
-        except KeyError:
-            pass
-
-        try:
-            module_build_info['INCLUDE_DIRS'] = (
-                create_list_of_strings(module_build_info['INCLUDE_DIRS']))
-        except KeyError:
-            pass
-
-        return module_build_info
-
-
-def use_module(bld):
-    module_build_info = read_module_build_info(bld)
-    source = bld.path.ant_glob('src/*.xc')
-    bld.env.MODULE_XCC_FLAGS = module_build_info['MODULE_XCC_FLAGS']
-    bld.module(
-        source=source,
-        depends_on=module_build_info['DEPENDENT_MODULES'],
-        includes=module_build_info['INCLUDE_DIRS'],
-        version=module_build_info['VERSION'])