diff --git a/wolfcrypt/src/port/autosar/cryif.c b/wolfcrypt/src/port/autosar/cryif.c
index 0bd767b4b..6fd9cc1a2 100644
--- a/wolfcrypt/src/port/autosar/cryif.c
+++ b/wolfcrypt/src/port/autosar/cryif.c
@@ -28,13 +28,15 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
+
+#ifdef WOLFSSL_AUTOSAR
+#ifndef NO_WOLFSSL_AUTOSAR_CRYIF
+
 #include <wolfssl/version.h>
 #include <wolfssl/wolfcrypt/port/autosar/Csm.h>
 #include <wolfssl/wolfcrypt/port/autosar/CryIf.h>
 #include <wolfssl/wolfcrypt/port/autosar/Crypto.h>
 
-#ifdef WOLFSSL_AUTOSAR
-#ifndef NO_WOLFSSL_AUTOSAR_CRYIF
 
 #include <wolfssl/wolfcrypt/logging.h>
 
diff --git a/wolfcrypt/src/port/autosar/crypto.c b/wolfcrypt/src/port/autosar/crypto.c
index f7812f190..d5a7509f6 100644
--- a/wolfcrypt/src/port/autosar/crypto.c
+++ b/wolfcrypt/src/port/autosar/crypto.c
@@ -25,12 +25,12 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/port/autosar/Csm.h>
-#include <wolfssl/wolfcrypt/port/autosar/Crypto.h>
 
 #ifdef WOLFSSL_AUTOSAR
 #ifndef NO_WOLFSSL_AUTOSAR_CRYPTO
 
+#include <wolfssl/wolfcrypt/port/autosar/Csm.h>
+#include <wolfssl/wolfcrypt/port/autosar/Crypto.h>
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/wolfcrypt/aes.h>
 #include <wolfssl/wolfcrypt/random.h>
diff --git a/wolfcrypt/src/port/autosar/csm.c b/wolfcrypt/src/port/autosar/csm.c
index f5df124b9..8fa6063a7 100644
--- a/wolfcrypt/src/port/autosar/csm.c
+++ b/wolfcrypt/src/port/autosar/csm.c
@@ -25,14 +25,15 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
+
+#ifdef WOLFSSL_AUTOSAR
+#ifndef NO_WOLFSSL_AUTOSAR_CSM
+
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/version.h>
 #include <wolfssl/wolfcrypt/port/autosar/Csm.h>
 #include <wolfssl/wolfcrypt/port/autosar/CryIf.h>
 
-#ifdef WOLFSSL_AUTOSAR
-#ifndef NO_WOLFSSL_AUTOSAR_CSM
-
 
 /* AutoSAR 4.4 */
 /* basic shim layer to plug in wolfSSL crypto */
diff --git a/wolfcrypt/src/port/autosar/test.c b/wolfcrypt/src/port/autosar/test.c
index 4c311f189..29cd8fc3e 100644
--- a/wolfcrypt/src/port/autosar/test.c
+++ b/wolfcrypt/src/port/autosar/test.c
@@ -24,6 +24,9 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
+
+#ifdef WOLFSSL_AUTOSAR
+
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/wolfcrypt/port/autosar/Csm.h>
 #define BLOCK_SIZE 16
@@ -428,3 +431,5 @@ int main(int argc, char* argv[])
 #endif /* REDIRECTION_CONFIG */
     return ret;
 }
+
+#endif /* WOLFSSL_AUTOSAR */