diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h
index 0bd91c5..f432d4c 100644
--- a/DirectXTex/DirectXTexP.h
+++ b/DirectXTex/DirectXTexP.h
@@ -15,13 +15,17 @@
 
 #pragma once
 
-#if !defined(WIN32_LEAN_AND_MEAN)
+#pragma warning(push)
+#pragma warning(disable : 4005)
 #define WIN32_LEAN_AND_MEAN
-#endif
-
-#if !defined(NOMINMAX)
 #define NOMINMAX
-#endif
+#define NODRAWTEXT
+#define NOGDI
+#define NOBITMAP
+#define NOMCX
+#define NOSERVICE
+#define NOHELP
+#pragma warning(pop)
 
 #ifndef _WIN32_WINNT_WIN10
 #define _WIN32_WINNT_WIN10 0x0A00
diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp
index 807788a..310761a 100644
--- a/Texassemble/texassemble.cpp
+++ b/Texassemble/texassemble.cpp
@@ -6,6 +6,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 //--------------------------------------------------------------------------------------
 
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp
index 22cefbe..086cef5 100644
--- a/Texconv/texconv.cpp
+++ b/Texconv/texconv.cpp
@@ -6,6 +6,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 //--------------------------------------------------------------------------------------
 
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>