diff --git a/makefile.vs b/makefile.vs
index cc57a44..e6aef4c 100644
--- a/makefile.vs
+++ b/makefile.vs
@@ -24,10 +24,10 @@ OBJS_AVX2 = vs\bitpack_avx2.obj vs\bitunpack_avx2.obj vs\vp4c_avx2.obj vs\vp4d_a
 CFLAGS = $(CFLAGS) /DNSIMD
 !else
 OBJS = $(OBJS) $(OBJS_SSE)
-CFLAGS = $(CFLAGS) /D__SSE__ /D__SSE2__ /D__SSE3__ /D__SSSE3__ /D__SSE4_1__ /D__SSE4_2__ /DUSE_SSE
+CFLAGS = $(CFLAGS) /D__SSE__ /D__SSE2__ /D__SSE3__ /D__SSSE3__ /D__SSE4_1__ /D__SSE4_2__
 !if "$(AVX2)" == "1"
 OBJS = $(OBJS) $(OBJS_AVX2)
-CFLAGS = $(CFLAGS) /D__AVX2__ /DUSE_AVX2
+CFLAGS = $(CFLAGS) /D__AVX2__
 ARCH = /arch:AVX2
 !endif
 !endif
diff --git a/plugins.cc b/plugins.cc
index 865447c..bb8be50 100644
--- a/plugins.cc
+++ b/plugins.cc
@@ -114,7 +114,7 @@ enum {
   TB_BPN128V,
   TB_EF128V,
 
-  #if defined(__AVX2__) && defined(USE_AVX2)
+  #if defined(__AVX2__)
 #define C_TURBOPFOR256  CODEC0V
   #else
 #define C_TURBOPFOR256  0
@@ -172,7 +172,7 @@ enum {
   #endif
   LI_HORPACK,
 
-  #if defined(__AVX2__) && defined(USE_AVX2)
+  #if defined(__AVX2__)
 #define C_LITTLEPACKBMI CODEC1
   #else
 #define C_LITTLEPACKBMI 0
@@ -224,7 +224,7 @@ enum {
   SC_FORDA,
   SC_SIMDPACK128,
 
-  #if defined(__AVX2__) && defined(USE_AVX2)
+  #if defined(__AVX2__)
 #define C_SIMDCOMP256   CODEC0V
   #else
 #define C_SIMDCOMP256   0
diff --git a/vs/vs2017/TurboPFor.vcxproj b/vs/vs2017/TurboPFor.vcxproj
index ca0693f..9bff7d7 100644
--- a/vs/vs2017/TurboPFor.vcxproj
+++ b/vs/vs2017/TurboPFor.vcxproj
@@ -101,7 +101,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;USE_SSE;USE_AVX2;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -130,7 +130,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;USE_SSE;USE_AVX2;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>