diff --git a/src/tpm2.c b/src/tpm2.c
index dbd3293c..92ab4407 100644
--- a/src/tpm2.c
+++ b/src/tpm2.c
@@ -26,9 +26,15 @@
 #include <wolftpm/tpm2.h>
 #include <wolftpm/tpm2_packet.h>
 #include <wolftpm/tpm2_tis.h>
-#include <wolftpm/tpm2_linux.h>
-#include <wolftpm/tpm2_swtpm.h>
-#include <wolftpm/tpm2_winapi.h>
+#if defined(WOLFTPM_LINUX_DEV) || defined(WOLFTPM_LINUX_DEV_AUTODETECT)
+    #include <wolftpm/tpm2_linux.h>
+#endif
+#ifdef WOLFTPM_SWTPM
+    #include <wolftpm/tpm2_swtpm.h>
+#endif
+#ifdef WOLFTPM_WINAPI
+    #include <wolftpm/tpm2_winapi.h>
+#endif
 #include <wolftpm/tpm2_param_enc.h>
 
 #include <hal/tpm_io.h>
diff --git a/wolftpm/tpm2_linux.h b/wolftpm/tpm2_linux.h
index 39c67636..d4025c5f 100644
--- a/wolftpm/tpm2_linux.h
+++ b/wolftpm/tpm2_linux.h
@@ -22,6 +22,8 @@
 #ifndef _TPM2_LINUX_H_
 #define _TPM2_LINUX_H_
 
+#if defined(WOLFTPM_LINUX_DEV) || defined(WOLFTPM_LINUX_DEV_AUTODETECT)
+
 #include <wolftpm/tpm2.h>
 #include <wolftpm/tpm2_packet.h>
 
@@ -47,4 +49,6 @@ WOLFTPM_LOCAL int TPM2_LINUX_AUTODETECT_SendCommand(TPM2_CTX* ctx,
     }  /* extern "C" */
 #endif
 
+#endif /* WOLFTPM_LINUX_DEV || WOLFTPM_LINUX_DEV_AUTODETECT */
+
 #endif /* _TPM2_LINUX_H_ */
diff --git a/wolftpm/tpm2_swtpm.h b/wolftpm/tpm2_swtpm.h
index 1204a194..5e7d601f 100644
--- a/wolftpm/tpm2_swtpm.h
+++ b/wolftpm/tpm2_swtpm.h
@@ -22,6 +22,8 @@
 #ifndef _TPM2_SWTPM_H_
 #define _TPM2_SWTPM_H_
 
+#ifdef WOLFTPM_SWTPM
+
 #include <wolftpm/tpm2.h>
 #include <wolftpm/tpm2_packet.h>
 
@@ -49,4 +51,6 @@ WOLFTPM_LOCAL int TPM2_SWTPM_SendCommand(TPM2_CTX* ctx, TPM2_Packet* packet);
     }  /* extern "C" */
 #endif
 
+#endif /* WOLFTPM_SWTPM */
+
 #endif /* _TPM2_SWTPM_H_ */
diff --git a/wolftpm/tpm2_winapi.h b/wolftpm/tpm2_winapi.h
index 9f16e482..d9eb96b9 100644
--- a/wolftpm/tpm2_winapi.h
+++ b/wolftpm/tpm2_winapi.h
@@ -22,6 +22,8 @@
 #ifndef _TPM2_WINAPI_H_
 #define _TPM2_WINAPI_H_
 
+#ifdef WOLFTPM_WINAPI
+
 #include <wolftpm/tpm2.h>
 #include <wolftpm/tpm2_packet.h>
 
@@ -39,4 +41,6 @@ WOLFTPM_LOCAL int TPM2_WinApi_Cleanup(TPM2_CTX* ctx);
     }  /* extern "C" */
 #endif
 
+#endif /* WOLFTPM_WINAPI */
+
 #endif /* _TPM2_WINAPI_H_ */