diff --git a/misc.cpp b/misc.cpp
index f16af667..3c2c2a5f 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -8,6 +8,10 @@
 #include "words.h"
 #include <new>
 
+#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
+#include <malloc.h>
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 void xorbuf(byte *buf, const byte *mask, size_t count)
diff --git a/rijndael.cpp b/rijndael.cpp
index fbc7dccb..9a779024 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -74,6 +74,7 @@ being unloaded from L1 cache, until that round is finished.
 #include "cpu.h"
 
 #if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+#include <smmintrin.h>
 #include <wmmintrin.h>
 #endif
 
diff --git a/secblock.h b/secblock.h
index ecb397fb..24b9fc09 100644
--- a/secblock.h
+++ b/secblock.h
@@ -7,10 +7,6 @@
 #include "misc.h"
 #include <assert.h>
 
-#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
-	#include <malloc.h>
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
 
 // ************** secure memory allocation ***************