Merged PR 8363553: Remove outdated includes

Related work items: #38706387
2023-01-13 21:10:16 +00:00 · 2023-01-13 21:10:16 +00:00 · 0502eaf171
--- a/gen/sources
+++ b/gen/sources
@ -11,8 +11,6 @@ TEST_CODE= 1
 LINK_TIME_CODE_GENERATION = 1

 INCLUDES= \
-    $(DS_INC_PATH);                 \
-#    $(DS_INC_PATH)\crypto; \
    ..\lib ; \
    ..\inc ; \
    $(DDK_INC_PATH); \
--- a/lib/sources
+++ b/lib/sources
@ -62,7 +62,6 @@ NTTARGETFILE0=\

 INCLUDES=  \
    ..\inc; \
-    $(DS_INC_PATH)\crypto; \
    $(IFSKIT_INC_PATH); \
 #    $(MINWIN_PRIVATE_PRIV_SDK_INC_PATH_L)\boot; \
    $(OBJECT_ROOT)\SymCrypt\Publics\$(O); \
--- a/test/indirect_call_perf/sources
+++ b/test/indirect_call_perf/sources
@ -9,9 +9,7 @@ UMTYPE=console
 # mark this as test code, as that re-enabled the __DATE__ and __TIME__ macros in the compiler.
 TEST_CODE= 1

-INCLUDES=   $(DS_INC_PATH);                 \
-            $(DS_INC_PATH)\crypto; \
-            ..\..\inc ; \
+INCLUDES=   ..\..\inc ; \
            $(DDK_INC_PATH); \

 SOURCES= \
--- a/unittest/lib/sources
+++ b/unittest/lib/sources
@ -13,10 +13,7 @@ TEST_CODE= 1
 LINK_TIME_CODE_GENERATION = 1

 INCLUDES= \
-    $(DS_INC_PATH);                 \
-    $(DS_INC_PATH)\crypto; \
    $(ONECOREDS_INTERNAL_INC_PATH_L)\crypto; \
-    $(MINWIN_PRIV_SDK_INC_PATH)\crypto; \
    ..\..\inc ; \
    ..\inc ; \
    ..\..\lib ; \
--- a/unittest/module_windows/sources
+++ b/unittest/module_windows/sources
@ -12,7 +12,6 @@ C_DEFINES=$(C_DEFINES) -DINCLUDE_IMPL_MSBIGNUM=0 -DINCLUDE_IMPL_RSA32=0
 INCLUDES= \
    ..\inc; \
    ..\..\inc ; \
-    $(MINWIN_PRIV_SDK_INC_PATH)\crypto; \
    $(DDK_INC_PATH); \

 SOURCES= \
--- a/unittest/module_windows_sys_km/sources
+++ b/unittest/module_windows_sys_km/sources
@ -5,7 +5,6 @@ MSC_WARNING_LEVEL=/W4 /WX

 INCLUDES= \
    ..\..\..\released\windows\ntrsa32\inc; \
-    $(DS_INC_PATH); \
    ..\..\inc ; \
    ..\lib ; \
    ..\inc ; \
--- a/unittest/module_windows_sys_um/sources
+++ b/unittest/module_windows_sys_um/sources
@ -13,7 +13,6 @@ C_DEFINES=$(C_DEFINES) -DINCLUDE_IMPL_MSBIGNUM=0 -DINCLUDE_IMPL_RSA32=0
 INCLUDES= \
    ..\inc; \
    ..\..\inc ; \
-    $(MINWIN_PRIV_SDK_INC_PATH)\crypto; \
    $(DDK_INC_PATH); \

 SOURCES= \
--- a/unittest/sources_exe.inc
+++ b/unittest/sources_exe.inc
@ -18,13 +18,7 @@ INCLUDES= \
    ..\..\inc; \
    ..\lib; \
    $(OBJECT_ROOT)\SymCrypt\Publics\$(O); \
-    $(DS_INC_PATH);                 \
-    $(DS_INC_PATH)\crypto; \
-    $(ONECOREDS_INC_PATH)\crypto; \
-    $(ONECOREDS_PRIVATE_INC_PATH_L)\crypto; \
    $(ONECOREDS_INTERNAL_INC_PATH_L)\crypto; \
-    $(MINWIN_PRIV_SDK_INC_PATH)\crypto; \
-#   $(ONECORE_PRIVATE_PATH)\ds\inc\crypto; \
    $(DDK_INC_PATH); \

 SOURCES= \
--- a/unittest/sys_Win7nLater/sources
+++ b/unittest/sys_Win7nLater/sources
@ -12,8 +12,6 @@ LINK_TIME_CODE_GENERATION = 1

 INCLUDES= \
    ..\..\..\released\windows\ntrsa32\inc; \
-    $(DS_INC_PATH);                 \
-#    $(DS_INC_PATH)\crypto; \
    ..\..\inc ; \
    ..\lib ; \
    ..\inc ; \
--- a/unittest/sys_legacy/sources
+++ b/unittest/sys_legacy/sources
@ -12,8 +12,6 @@ LINK_TIME_CODE_GENERATION = 1

 INCLUDES= \
    ..\..\..\released\windows\ntrsa32\inc; \
-    $(DS_INC_PATH);                 \
-#    $(DS_INC_PATH)\crypto; \
    ..\..\inc ; \
    ..\lib ; \
    ..\inc ; \
--- a/unittest/sys_test/sources
+++ b/unittest/sys_test/sources
@ -12,8 +12,6 @@ LINK_TIME_CODE_GENERATION = 1

 INCLUDES= \
    ..\..\..\released\windows\ntrsa32\inc; \
-    $(DS_INC_PATH);                 \
-#    $(DS_INC_PATH)\crypto; \
    ..\..\inc ; \
    ..\lib ; \
    ..\inc ; \