diff --git a/sys/ByteArray.c b/sys/ByteArray.c
index 5968db5..0a00e7d 100644
--- a/sys/ByteArray.c
+++ b/sys/ByteArray.c
@@ -1,4 +1,6 @@
 #include "ByteArray.h"
+#include "trace.h"
+#include "bytearray.tmh"
 
 //
 // Helpers
diff --git a/sys/Ds4.c b/sys/Ds4.c
index 027ee2a..c312947 100644
--- a/sys/Ds4.c
+++ b/sys/Ds4.c
@@ -25,6 +25,7 @@ SOFTWARE.
 
 #include "busenum.h"
 #include <hidclass.h>
+#include "ds4.tmh"
 
 NTSTATUS Ds4_PreparePdo(PWDFDEVICE_INIT DeviceInit, PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription)
 {
diff --git a/sys/Queue.c b/sys/Queue.c
index 08f211e..05a1e25 100644
--- a/sys/Queue.c
+++ b/sys/Queue.c
@@ -24,6 +24,7 @@ SOFTWARE.
 
 
 #include "busenum.h"
+#include "queue.tmh"
 
 #ifdef ALLOC_PRAGMA
 #pragma alloc_text (PAGE, Bus_EvtIoDefault)
diff --git a/sys/buspdo.c b/sys/buspdo.c
index 108245d..bd5663a 100644
--- a/sys/buspdo.c
+++ b/sys/buspdo.c
@@ -26,6 +26,7 @@ SOFTWARE.
 #include "busenum.h"
 #include <wdmsec.h>
 #include <usbioctl.h>
+#include "buspdo.tmh"
 
 #ifdef ALLOC_PRAGMA
 #pragma alloc_text(PAGE, Bus_CreatePdo)
diff --git a/sys/usbpdo.c b/sys/usbpdo.c
index 7311007..cacce60 100644
--- a/sys/usbpdo.c
+++ b/sys/usbpdo.c
@@ -24,6 +24,7 @@ SOFTWARE.
 
 
 #include "busenum.h"
+#include "usbpdo.tmh"
 
 
 //
diff --git a/sys/util.c b/sys/util.c
index 0d6b7bc..3ebc372 100644
--- a/sys/util.c
+++ b/sys/util.c
@@ -25,6 +25,7 @@ SOFTWARE.
 
 #include <ntifs.h>
 #include "busenum.h"
+#include "util.tmh"
 
 
 VOID ReverseByteArray(PUCHAR Array, INT Length)
diff --git a/sys/xgip.c b/sys/xgip.c
index 6c42d3f..b113bd9 100644
--- a/sys/xgip.c
+++ b/sys/xgip.c
@@ -24,6 +24,7 @@ SOFTWARE.
 
 
 #include "busenum.h"
+#include "xgip.tmh"
 
 NTSTATUS Xgip_PreparePdo(PWDFDEVICE_INIT DeviceInit, PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription)
 {
diff --git a/sys/xusb.c b/sys/xusb.c
index 7bda9e0..90e5a70 100644
--- a/sys/xusb.c
+++ b/sys/xusb.c
@@ -24,6 +24,7 @@ SOFTWARE.
 
 
 #include "busenum.h"
+#include "xusb.tmh"
 
 NTSTATUS Xusb_PreparePdo(
     PWDFDEVICE_INIT DeviceInit,