summaryrefslogtreecommitdiff
path: root/src/VBox/HostDrivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/VBox/HostDrivers')
-rw-r--r--src/VBox/HostDrivers/Support/SUPDrvSem.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/SUPLibSem.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/SUPR0IdcClient.c2
-rw-r--r--src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c2
-rw-r--r--src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c2
-rw-r--r--src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/SUPSvcGrant.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c2
-rw-r--r--src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c2
-rw-r--r--src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c2
-rw-r--r--src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c2
-rw-r--r--src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstInit.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstInt.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstLow.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstPin.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp2
-rw-r--r--src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c2
-rw-r--r--src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp2
-rw-r--r--src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c4
-rw-r--r--src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c2
-rw-r--r--src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c2
-rw-r--r--src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp2
-rw-r--r--src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp2
-rw-r--r--src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp2
-rw-r--r--src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp4
-rw-r--r--src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp4
-rw-r--r--src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp2
-rw-r--r--src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp2
37 files changed, 40 insertions, 40 deletions
diff --git a/src/VBox/HostDrivers/Support/SUPDrvSem.cpp b/src/VBox/HostDrivers/Support/SUPDrvSem.cpp
index 1aeef558e77..129188e7770 100644
--- a/src/VBox/HostDrivers/Support/SUPDrvSem.cpp
+++ b/src/VBox/HostDrivers/Support/SUPDrvSem.cpp
@@ -47,7 +47,7 @@
#include <VBox/param.h>
#include <VBox/log.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
/**
diff --git a/src/VBox/HostDrivers/Support/SUPLibSem.cpp b/src/VBox/HostDrivers/Support/SUPLibSem.cpp
index e28a2fea341..84c2e6e9166 100644
--- a/src/VBox/HostDrivers/Support/SUPLibSem.cpp
+++ b/src/VBox/HostDrivers/Support/SUPLibSem.cpp
@@ -31,7 +31,7 @@
#define LOG_GROUP LOG_GROUP_SUP
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/param.h>
#include <iprt/assert.h>
diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c
index 7bc2b7f2ce2..5db5870b5d6 100644
--- a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c
+++ b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/asm.h>
diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c
index 029cc6c5e49..7b089671fd0 100644
--- a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c
+++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
/**
diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
index 46333d0793d..4cc5130aa00 100644
--- a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
+++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/asm.h>
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp
index 37f2df220e7..40422489bd3 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp
@@ -30,7 +30,7 @@
*********************************************************************************************************************************/
#define LOG_GROUP LOG_GROUP_SUP
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/log.h>
#include <iprt/string.h>
#include <iprt/stdarg.h>
diff --git a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp
index 743145159eb..3a1240ce849 100644
--- a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp
+++ b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp
@@ -30,7 +30,7 @@
*********************************************************************************************************************************/
#include "SUPSvcInternal.h"
-#include <iprt/err.h>
+#include <iprt/errcore.h>
#include <iprt/assert.h>
diff --git a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp
index 8670e40baff..1e31d11ccf2 100644
--- a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp
+++ b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp
@@ -33,7 +33,7 @@
#include <VBox/log.h>
#include <iprt/asm.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
#include <iprt/assert.h>
#include <iprt/critsect.h>
#include <iprt/mem.h>
diff --git a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c
index 3ee0cfca66a..47d88769577 100644
--- a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c
+++ b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "../SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq)
diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c
index b8db6c688c4..20589e0d608 100644
--- a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c
+++ b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "../SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq)
diff --git a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c
index e3476a99389..f94ac76b3e7 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c
+++ b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "../SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq)
diff --git a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c
index 368080e6ca4..6bea21b7db7 100644
--- a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c
+++ b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "../SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq)
diff --git a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c
index 6b06a5b1882..f33e7a98371 100644
--- a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c
+++ b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "../SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq)
diff --git a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
index 05f2db483ed..40ac8fad4e8 100644
--- a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
@@ -35,7 +35,7 @@
#include <iprt/stream.h>
#include <iprt/string.h>
#include <iprt/ctype.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
/**
diff --git a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp
index 24cfe07dd52..b5ba40ecfb3 100644
--- a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/initterm.h>
#include <iprt/stream.h>
#include <iprt/message.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
index 09b5b44ebcd..4e4df5d1352 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/param.h>
#include <iprt/asm.h>
#include <iprt/assert.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
index f7a63a77c74..6e5f6a6b42e 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/initterm.h>
#include <iprt/stream.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
index 9085bbe93d9..e2857dc0497 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/initterm.h>
#include <iprt/stream.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
index 2fc9456b777..e86ccef5866 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
@@ -32,7 +32,7 @@
#include <VBox/vmm/vm.h>
#include <VBox/vmm/vmm.h>
#include <VBox/vmm/gvmm.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/param.h>
#include <iprt/asm-amd64-x86.h>
#include <iprt/initterm.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
index 57142ebde56..931837fc09b 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
@@ -30,7 +30,7 @@
*********************************************************************************************************************************/
#include <VBox/sup.h>
#include <VBox/param.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/initterm.h>
#include <iprt/stream.h>
#include <iprt/string.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
index b881c32ac98..532aeefedcd 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
@@ -30,7 +30,7 @@
*********************************************************************************************************************************/
#include <VBox/sup.h>
#include <VBox/param.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/initterm.h>
#include <iprt/stream.h>
#include <iprt/thread.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
index e5f4582c75d..e776b540368 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/getopt.h>
#include <iprt/initterm.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
index 5e0572fc6bb..b2bd96b8752 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
@@ -32,7 +32,7 @@
#include <VBox/param.h>
#include <iprt/env.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
#include <iprt/initterm.h>
#include <iprt/process.h>
#include <iprt/stream.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp
index aac84b479e0..c409bec904e 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/assert.h>
#include <iprt/stream.h>
#include <iprt/string.h>
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp
index 53b916a0127..274c4c890db 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/getopt.h>
#include <iprt/initterm.h>
diff --git a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c
index ffc0d03fdfc..de055d350ee 100644
--- a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c
+++ b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include "../SUPR0IdcClientInternal.h"
-#include <VBox/err.h>
+#include <iprt/errcore.h>
/*********************************************************************************************************************************
diff --git a/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp b/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp
index f27acd07515..8598edf0add 100644
--- a/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp
@@ -36,7 +36,7 @@
#endif
#include <VBox/sup.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/assert.h>
#include <iprt/ctype.h>
#include <iprt/heap.h>
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
index 6cf75affd6d..da881d283ef 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
+++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
@@ -56,7 +56,7 @@
#define LOG_GROUP LOG_GROUP_NET_ADP_DRV
#include <VBox/version.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/log.h>
#include <iprt/initterm.h>
#include <iprt/string.h>
@@ -65,7 +65,7 @@
#include <iprt/assert.h>
#include <iprt/uuid.h>
#include <iprt/alloc.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
#define VBOXNETADP_OS_SPECFIC 1
#include "../VBoxNetAdpInternal.h"
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
index 16d89966238..f2ea60e290a 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
@@ -39,7 +39,7 @@
#define LOG_GROUP LOG_GROUP_NET_ADP_DRV
#include <VBox/log.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/process.h>
#include <iprt/initterm.h>
#include <iprt/mem.h>
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c
index e4df60bbd29..80b5c47feed 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c
+++ b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c
@@ -30,7 +30,7 @@
*********************************************************************************************************************************/
#define LOG_GROUP LOG_GROUP_NET_ADP_DRV
#include <VBox/log.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/version.h>
#include <iprt/assert.h>
#include <iprt/semaphore.h>
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp
index 740cf9a9522..ecef37578e1 100644
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/usblib.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/log.h>
#include "VBoxUSBInterface.h"
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp
index 5c39cadfea6..ab9254e9f9c 100644
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp
@@ -50,7 +50,7 @@
#include <iprt/semaphore.h>
#include <iprt/process.h>
#include <iprt/alloc.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
#include <iprt/asm.h>
#include <mach/kmod.h>
diff --git a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp
index f6c016184a2..05481ff2a00 100644
--- a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp
@@ -29,7 +29,7 @@
* Header Files *
*********************************************************************************************************************************/
#include <VBox/usbfilter.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/string.h>
#include <iprt/stream.h>
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp
index bb106e118fa..ced7487e8a6 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp
@@ -32,13 +32,13 @@
#include <iprt/win/setupapi.h>
#include <newdev.h>
#include <iprt/assert.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
#include <iprt/initterm.h>
#include <iprt/param.h>
#include <iprt/path.h>
#include <iprt/stream.h>
#include <iprt/string.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <stdio.h>
#include <VBox/VBoxDrvCfg-win.h>
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
index fafcaaf958e..17fea102a9c 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
@@ -33,11 +33,11 @@
#include <newdev.h>
#include <iprt/assert.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
#include <iprt/param.h>
#include <iprt/path.h>
#include <iprt/string.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <VBox/VBoxDrvCfg-win.h>
#include <stdio.h>
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
index 08dffb8b6bf..7eeca62dfc1 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
@@ -34,7 +34,7 @@
#include <VBox/types.h>
#include <iprt/process.h>
#include <iprt/assert.h>
-#include <VBox/err.h>
+#include <iprt/errcore.h>
#include <iprt/assert.h>
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
index f4c0824c2c4..a7456302d9c 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -30,7 +30,7 @@
*********************************************************************************************************************************/
#include "VBoxUsbMon.h"
#include "../cmn/VBoxUsbIdc.h"
-#include <vbox/err.h>
+#include <iprt/errcore.h>
#include <VBox/usblib.h>
#include <excpt.h>