diff --git a/indra/llcommon/ndintrin.h b/indra/llcommon/ndintrin.h
index 08dfbabdc6..cd90d6fcf5 100644
--- a/indra/llcommon/ndintrin.h
+++ b/indra/llcommon/ndintrin.h
@@ -26,15 +26,7 @@
  */
 
 
-#ifndef LL_STDTYPES_H
-	#if LL_WINDOWS
-		typedef LONG U32;
-	#else
-		typedef unsigned int U32;
-	#endif
-
-	typedef unsigned char U8;
-#endif
+#include "stdtypes.h"
 
 namespace ndIntrin
 {
diff --git a/indra/llcommon/ndpooldefines.h b/indra/llcommon/ndpooldefines.h
index dbdb00d6bc..9d4c0fcd29 100644
--- a/indra/llcommon/ndpooldefines.h
+++ b/indra/llcommon/ndpooldefines.h
@@ -25,9 +25,7 @@
 #ifndef NDPOOLDEFINES_H
 #define NDPOOLDEFINES_H
 
-#ifndef LL_STDTYPES_H
- #include "stdtypes.h"
-#endif
+#include "stdtypes.h"
 
 #define FROM_MB( mbVal ) (mbVal*1024*1024)
 #define TO_MB( bVal ) ( bVal / (1024*1024) )