Move libapps headers into their own directory

This got triggered by test/testutil.h including ../apps/opt.h.

Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.

As a specific example, test/testutil/basic_output.c included
../testutil.h.  Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.

The solution could have been to simply add apps/ as an inclusion
directory.  However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.

Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)

8 files changed, 116 insertions, 116 deletions

diff --git a/apps/build.info b/apps/build.info
index 7a5e876..9b77c469 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -15,12 +15,12 @@
 IF[{- !$disabled{apps} -}]
   LIBS{noinst}=libapps.a
   SOURCE[libapps.a]={- join(" ", @apps_lib_src) -}
-  INCLUDE[libapps.a]=.. ../include
+  INCLUDE[libapps.a]=.. ../include include
 
   PROGRAMS=openssl
   SOURCE[openssl]={- join(" ", @apps_init_src) -}
   SOURCE[openssl]={- join(" ", @apps_openssl_src) -}
-  INCLUDE[openssl]=.. ../include
+  INCLUDE[openssl]=.. ../include include
   DEPEND[openssl]=libapps.a ../libssl
 
 IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}]
diff --git a/apps/apps.h b/apps/include/apps.h
index da8eae2..da8eae2 100644
--- a/apps/apps.h
+++ b/apps/include/apps.h
diff --git a/apps/apps_ui.h b/apps/include/apps_ui.h
index 36e0864..36e0864 100644
--- a/apps/apps_ui.h
+++ b/apps/include/apps_ui.h
diff --git a/apps/fmt.h b/apps/include/fmt.h
index 538a20a..538a20a 100644
--- a/apps/fmt.h
+++ b/apps/include/fmt.h
diff --git a/apps/opt.h b/apps/include/opt.h
index ecfa06e..ecfa06e 100644
--- a/apps/opt.h
+++ b/apps/include/opt.h
diff --git a/apps/s_apps.h b/apps/include/s_apps.h
index d941ccd..d941ccd 100644
--- a/apps/s_apps.h
+++ b/apps/include/s_apps.h
diff --git a/test/build.info b/test/build.info
index b2b7375..7d4f953 100644
--- a/test/build.info
+++ b/test/build.info
@@ -15,7 +15,7 @@ IF[{- !$disabled{tests} -}]
           testutil/format_output.c testutil/tap_bio.c \
           testutil/test_cleanup.c testutil/main.c testutil/init.c \
           testutil/options.c testutil/test_options.c ../apps/opt.c
-  INCLUDE[libtestutil.a]=../include ..
+  INCLUDE[libtestutil.a]=../include ../apps/include ..
   DEPEND[libtestutil.a]=../libcrypto
 
   PROGRAMS{noinst}=\
@@ -48,234 +48,234 @@ IF[{- !$disabled{tests} -}]
           sysdefaulttest errtest gosttest
 
   SOURCE[versions]=versions.c
-  INCLUDE[versions]=../include
+  INCLUDE[versions]=../include ../apps/include
   DEPEND[versions]=../libcrypto
 
   SOURCE[aborttest]=aborttest.c
-  INCLUDE[aborttest]=../include
+  INCLUDE[aborttest]=../include ../apps/include
   DEPEND[aborttest]=../libcrypto
 
   SOURCE[sanitytest]=sanitytest.c
-  INCLUDE[sanitytest]=../include
+  INCLUDE[sanitytest]=../include ../apps/include
   DEPEND[sanitytest]=../libcrypto libtestutil.a
 
   SOURCE[rsa_complex]=rsa_complex.c
-  INCLUDE[rsa_complex]=../include
+  INCLUDE[rsa_complex]=../include ../apps/include
 
   SOURCE[test_test]=test_test.c
-  INCLUDE[test_test]=../include
+  INCLUDE[test_test]=../include ../apps/include
   DEPEND[test_test]=../libcrypto libtestutil.a
 
   SOURCE[exdatatest]=exdatatest.c
-  INCLUDE[exdatatest]=../include
+  INCLUDE[exdatatest]=../include ../apps/include
   DEPEND[exdatatest]=../libcrypto libtestutil.a
 
   SOURCE[bntest]=bntest.c
-  INCLUDE[bntest]=../include
+  INCLUDE[bntest]=../include ../apps/include
   DEPEND[bntest]=../libcrypto libtestutil.a
 
   SOURCE[ectest]=ectest.c
-  INCLUDE[ectest]=../include
+  INCLUDE[ectest]=../include ../apps/include
   DEPEND[ectest]=../libcrypto libtestutil.a
 
   SOURCE[ecstresstest]=ecstresstest.c
-  INCLUDE[ecstresstest]=../include
+  INCLUDE[ecstresstest]=../include ../apps/include
   DEPEND[ecstresstest]=../libcrypto libtestutil.a
 
   SOURCE[ecdsatest]=ecdsatest.c
-  INCLUDE[ecdsatest]=../include
+  INCLUDE[ecdsatest]=../include ../apps/include
   DEPEND[ecdsatest]=../libcrypto libtestutil.a
 
   SOURCE[gmdifftest]=gmdifftest.c
-  INCLUDE[gmdifftest]=../include
+  INCLUDE[gmdifftest]=../include ../apps/include
   DEPEND[gmdifftest]=../libcrypto libtestutil.a
 
   SOURCE[pbelutest]=pbelutest.c
-  INCLUDE[pbelutest]=../include
+  INCLUDE[pbelutest]=../include ../apps/include
   DEPEND[pbelutest]=../libcrypto libtestutil.a
 
   SOURCE[ideatest]=ideatest.c
-  INCLUDE[ideatest]=../include
+  INCLUDE[ideatest]=../include ../apps/include
   DEPEND[ideatest]=../libcrypto libtestutil.a
 
   SOURCE[md2test]=md2test.c
-  INCLUDE[md2test]=../include
+  INCLUDE[md2test]=../include ../apps/include
   DEPEND[md2test]=../libcrypto libtestutil.a
 
   SOURCE[hmactest]=hmactest.c
-  INCLUDE[hmactest]=../include
+  INCLUDE[hmactest]=../include ../apps/include
   DEPEND[hmactest]=../libcrypto libtestutil.a
 
   SOURCE[rc2test]=rc2test.c
-  INCLUDE[rc2test]=../include
+  INCLUDE[rc2test]=../include ../apps/include
   DEPEND[rc2test]=../libcrypto libtestutil.a
 
   SOURCE[rc4test]=rc4test.c
-  INCLUDE[rc4test]=../include
+  INCLUDE[rc4test]=../include ../apps/include
   DEPEND[rc4test]=../libcrypto libtestutil.a
 
   SOURCE[rc5test]=rc5test.c
-  INCLUDE[rc5test]=../include
+  INCLUDE[rc5test]=../include ../apps/include
   DEPEND[rc5test]=../libcrypto libtestutil.a
 
   SOURCE[destest]=destest.c
-  INCLUDE[destest]=../include
+  INCLUDE[destest]=../include ../apps/include
   DEPEND[destest]=../libcrypto libtestutil.a
 
   SOURCE[mdc2test]=mdc2test.c
-  INCLUDE[mdc2test]=../include
+  INCLUDE[mdc2test]=../include ../apps/include
   DEPEND[mdc2test]=../libcrypto libtestutil.a
 
   SOURCE[dhtest]=dhtest.c
-  INCLUDE[dhtest]=../include
+  INCLUDE[dhtest]=../include ../apps/include
   DEPEND[dhtest]=../libcrypto libtestutil.a
 
   SOURCE[enginetest]=enginetest.c
-  INCLUDE[enginetest]=../include
+  INCLUDE[enginetest]=../include ../apps/include
   DEPEND[enginetest]=../libcrypto libtestutil.a
 
   SOURCE[casttest]=casttest.c
-  INCLUDE[casttest]=../include
+  INCLUDE[casttest]=../include ../apps/include
   DEPEND[casttest]=../libcrypto libtestutil.a
 
   SOURCE[bftest]=bftest.c
-  INCLUDE[bftest]=../include
+  INCLUDE[bftest]=../include ../apps/include
   DEPEND[bftest]=../libcrypto libtestutil.a
 
   SOURCE[ssltest_old]=ssltest_old.c
-  INCLUDE[ssltest_old]=.. ../include
+  INCLUDE[ssltest_old]=.. ../include ../apps/include
   DEPEND[ssltest_old]=../libcrypto ../libssl
 
   SOURCE[dsatest]=dsatest.c
-  INCLUDE[dsatest]=../include
+  INCLUDE[dsatest]=../include ../apps/include
   DEPEND[dsatest]=../libcrypto libtestutil.a
 
   SOURCE[dsa_no_digest_size_test]=dsa_no_digest_size_test.c
-  INCLUDE[dsa_no_digest_size_test]=../include
+  INCLUDE[dsa_no_digest_size_test]=../include ../apps/include
   DEPEND[dsa_no_digest_size_test]=../libcrypto libtestutil.a
 
   SOURCE[exptest]=exptest.c
-  INCLUDE[exptest]=../include
+  INCLUDE[exptest]=../include ../apps/include
   DEPEND[exptest]=../libcrypto libtestutil.a
 
   SOURCE[rsa_test]=rsa_test.c
-  INCLUDE[rsa_test]=../include
+  INCLUDE[rsa_test]=../include ../apps/include
   DEPEND[rsa_test]=../libcrypto libtestutil.a
 
   SOURCE[rsa_mp_test]=rsa_mp_test.c
-  INCLUDE[rsa_mp_test]=../include
+  INCLUDE[rsa_mp_test]=../include ../apps/include
   DEPEND[rsa_mp_test]=../libcrypto libtestutil.a
 
   SOURCE[fatalerrtest]=fatalerrtest.c ssltestlib.c
-  INCLUDE[fatalerrtest]=../include
+  INCLUDE[fatalerrtest]=../include ../apps/include
   DEPEND[fatalerrtest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[tls13ccstest]=tls13ccstest.c ssltestlib.c
-  INCLUDE[tls13ccstest]=../include
+  INCLUDE[tls13ccstest]=../include ../apps/include
   DEPEND[tls13ccstest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[evp_test]=evp_test.c
-  INCLUDE[evp_test]=../include
+  INCLUDE[evp_test]=../include ../apps/include
   DEPEND[evp_test]=../libcrypto libtestutil.a
 
   SOURCE[evp_extra_test]=evp_extra_test.c
-  INCLUDE[evp_extra_test]=../include ../crypto/include
+  INCLUDE[evp_extra_test]=../include ../apps/include ../crypto/include
   DEPEND[evp_extra_test]=../libcrypto libtestutil.a
 
   SOURCE[igetest]=igetest.c
-  INCLUDE[igetest]=../include
+  INCLUDE[igetest]=../include ../apps/include
   DEPEND[igetest]=../libcrypto libtestutil.a
 
   SOURCE[v3nametest]=v3nametest.c
-  INCLUDE[v3nametest]=../include
+  INCLUDE[v3nametest]=../include ../apps/include
   DEPEND[v3nametest]=../libcrypto libtestutil.a
 
   SOURCE[crltest]=crltest.c
-  INCLUDE[crltest]=../include
+  INCLUDE[crltest]=../include ../apps/include
   DEPEND[crltest]=../libcrypto libtestutil.a
 
   SOURCE[v3ext]=v3ext.c
-  INCLUDE[v3ext]=../include
+  INCLUDE[v3ext]=../include ../apps/include
   DEPEND[v3ext]=../libcrypto libtestutil.a
 
   SOURCE[danetest]=danetest.c
-  INCLUDE[danetest]=../include
+  INCLUDE[danetest]=../include ../apps/include
   DEPEND[danetest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[constant_time_test]=constant_time_test.c
-  INCLUDE[constant_time_test]=../include
+  INCLUDE[constant_time_test]=../include ../apps/include
   DEPEND[constant_time_test]=../libcrypto libtestutil.a
 
   SOURCE[verify_extra_test]=verify_extra_test.c
-  INCLUDE[verify_extra_test]=../include
+  INCLUDE[verify_extra_test]=../include ../apps/include
   DEPEND[verify_extra_test]=../libcrypto libtestutil.a
 
   SOURCE[clienthellotest]=clienthellotest.c
-  INCLUDE[clienthellotest]=../include
+  INCLUDE[clienthellotest]=../include ../apps/include
   DEPEND[clienthellotest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[bad_dtls_test]=bad_dtls_test.c
-  INCLUDE[bad_dtls_test]=../include
+  INCLUDE[bad_dtls_test]=../include ../apps/include
   DEPEND[bad_dtls_test]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[packettest]=packettest.c
-  INCLUDE[packettest]=../include
+  INCLUDE[packettest]=../include ../apps/include
   DEPEND[packettest]=../libcrypto libtestutil.a
 
   SOURCE[asynctest]=asynctest.c
-  INCLUDE[asynctest]=../include
+  INCLUDE[asynctest]=../include ../apps/include
   DEPEND[asynctest]=../libcrypto
 
   SOURCE[secmemtest]=secmemtest.c
-  INCLUDE[secmemtest]=../include
+  INCLUDE[secmemtest]=../include ../apps/include
   DEPEND[secmemtest]=../libcrypto libtestutil.a
 
   SOURCE[srptest]=srptest.c
-  INCLUDE[srptest]=../include
+  INCLUDE[srptest]=../include ../apps/include
   DEPEND[srptest]=../libcrypto libtestutil.a
 
   SOURCE[memleaktest]=memleaktest.c
-  INCLUDE[memleaktest]=../include
+  INCLUDE[memleaktest]=../include ../apps/include
   DEPEND[memleaktest]=../libcrypto libtestutil.a
 
   SOURCE[stack_test]=stack_test.c
-  INCLUDE[stack_test]=../include
+  INCLUDE[stack_test]=../include ../apps/include
   DEPEND[stack_test]=../libcrypto libtestutil.a
 
   SOURCE[lhash_test]=lhash_test.c
-  INCLUDE[lhash_test]=../include
+  INCLUDE[lhash_test]=../include ../apps/include
   DEPEND[lhash_test]=../libcrypto libtestutil.a
 
   SOURCE[dtlsv1listentest]=dtlsv1listentest.c
-  INCLUDE[dtlsv1listentest]=../include
+  INCLUDE[dtlsv1listentest]=../include ../apps/include
   DEPEND[dtlsv1listentest]=../libssl libtestutil.a
 
   SOURCE[ct_test]=ct_test.c
-  INCLUDE[ct_test]=../include
+  INCLUDE[ct_test]=../include ../apps/include
   DEPEND[ct_test]=../libcrypto libtestutil.a
 
   SOURCE[threadstest]=threadstest.c
-  INCLUDE[threadstest]=../include
+  INCLUDE[threadstest]=../include ../apps/include
   DEPEND[threadstest]=../libcrypto libtestutil.a
 
   SOURCE[afalgtest]=afalgtest.c
-  INCLUDE[afalgtest]=../include
+  INCLUDE[afalgtest]=../include ../apps/include
   DEPEND[afalgtest]=../libcrypto libtestutil.a
 
   SOURCE[d2i_test]=d2i_test.c
-  INCLUDE[d2i_test]=../include
+  INCLUDE[d2i_test]=../include ../apps/include
   DEPEND[d2i_test]=../libcrypto libtestutil.a
 
   SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c
-  INCLUDE[ssl_test_ctx_test]=../include
+  INCLUDE[ssl_test_ctx_test]=../include ../apps/include
   DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c handshake_helper.c
-  INCLUDE[ssl_test]=../include
+  INCLUDE[ssl_test]=../include ../apps/include
   DEPEND[ssl_test]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[cipherlist_test]=cipherlist_test.c
-  INCLUDE[cipherlist_test]=../include
+  INCLUDE[cipherlist_test]=../include ../apps/include
   DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a
 
   INCLUDE[ssl_test_ctx.o]=../include
@@ -283,148 +283,148 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[ssltestlib.o]=.. ../include
 
   SOURCE[x509aux]=x509aux.c
-  INCLUDE[x509aux]=../include
+  INCLUDE[x509aux]=../include ../apps/include
   DEPEND[x509aux]=../libcrypto libtestutil.a
 
   SOURCE[asynciotest]=asynciotest.c ssltestlib.c
-  INCLUDE[asynciotest]=../include
+  INCLUDE[asynciotest]=../include ../apps/include
   DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[bio_callback_test]=bio_callback_test.c
-  INCLUDE[bio_callback_test]=../include
+  INCLUDE[bio_callback_test]=../include ../apps/include
   DEPEND[bio_callback_test]=../libcrypto libtestutil.a
 
   SOURCE[bio_memleak_test]=bio_memleak_test.c
-  INCLUDE[bio_memleak_test]=../include
+  INCLUDE[bio_memleak_test]=../include ../apps/include
   DEPEND[bio_memleak_test]=../libcrypto libtestutil.a
 
   SOURCE[bioprinttest]=bioprinttest.c
-  INCLUDE[bioprinttest]=../include
+  INCLUDE[bioprinttest]=../include ../apps/include
   DEPEND[bioprinttest]=../libcrypto libtestutil.a
 
   SOURCE[sslapitest]=sslapitest.c ssltestlib.c
-  INCLUDE[sslapitest]=../include ..
+  INCLUDE[sslapitest]=../include ../apps/include ..
   DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[ocspapitest]=ocspapitest.c
-  INCLUDE[ocspapitest]=../include
+  INCLUDE[ocspapitest]=../include ../apps/include
   DEPEND[ocspapitest]=../libcrypto libtestutil.a
 
   SOURCE[dtlstest]=dtlstest.c ssltestlib.c
-  INCLUDE[dtlstest]=../include
+  INCLUDE[dtlstest]=../include ../apps/include
   DEPEND[dtlstest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
-  INCLUDE[sslcorrupttest]=../include
+  INCLUDE[sslcorrupttest]=../include ../apps/include
   DEPEND[sslcorrupttest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[bio_enc_test]=bio_enc_test.c
-  INCLUDE[bio_enc_test]=../include
+  INCLUDE[bio_enc_test]=../include ../apps/include
   DEPEND[bio_enc_test]=../libcrypto libtestutil.a
 
   SOURCE[pkey_meth_test]=pkey_meth_test.c
-  INCLUDE[pkey_meth_test]=../include
+  INCLUDE[pkey_meth_test]=../include ../apps/include
   DEPEND[pkey_meth_test]=../libcrypto libtestutil.a
 
   SOURCE[pkey_meth_kdf_test]=pkey_meth_kdf_test.c
-  INCLUDE[pkey_meth_kdf_test]=../include
+  INCLUDE[pkey_meth_kdf_test]=../include ../apps/include
   DEPEND[pkey_meth_kdf_test]=../libcrypto libtestutil.a
 
   SOURCE[x509_time_test]=x509_time_test.c
-  INCLUDE[x509_time_test]=../include
+  INCLUDE[x509_time_test]=../include ../apps/include
   DEPEND[x509_time_test]=../libcrypto libtestutil.a
 
   SOURCE[recordlentest]=recordlentest.c ssltestlib.c
-  INCLUDE[recordlentest]=../include
+  INCLUDE[recordlentest]=../include ../apps/include
   DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[drbgtest]=drbgtest.c
-  INCLUDE[drbgtest]=../include
+  INCLUDE[drbgtest]=../include ../apps/include
   DEPEND[drbgtest]=../libcrypto.a libtestutil.a
 
   SOURCE[drbg_cavs_test]=drbg_cavs_test.c drbg_cavs_data_ctr.c \
                          drbg_cavs_data_hash.c drbg_cavs_data_hmac.c
 
-  INCLUDE[drbg_cavs_test]=../include . ..
+  INCLUDE[drbg_cavs_test]=../include ../apps/include . ..
   DEPEND[drbg_cavs_test]=../libcrypto libtestutil.a
 
   SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
-  INCLUDE[x509_dup_cert_test]=../include
+  INCLUDE[x509_dup_cert_test]=../include ../apps/include
   DEPEND[x509_dup_cert_test]=../libcrypto libtestutil.a
 
   SOURCE[x509_check_cert_pkey_test]=x509_check_cert_pkey_test.c
-  INCLUDE[x509_check_cert_pkey_test]=../include
+  INCLUDE[x509_check_cert_pkey_test]=../include ../apps/include
   DEPEND[x509_check_cert_pkey_test]=../libcrypto libtestutil.a
 
   SOURCE[pemtest]=pemtest.c
-  INCLUDE[pemtest]=../include
+  INCLUDE[pemtest]=../include ../apps/include
   DEPEND[pemtest]=../libcrypto libtestutil.a
 
   SOURCE[ssl_cert_table_internal_test]=ssl_cert_table_internal_test.c
-  INCLUDE[ssl_cert_table_internal_test]=.. ../include
+  INCLUDE[ssl_cert_table_internal_test]=.. ../include ../apps/include
   DEPEND[ssl_cert_table_internal_test]=../libcrypto libtestutil.a
 
   SOURCE[ciphername_test]=ciphername_test.c
-  INCLUDE[ciphername_test]=../include
+  INCLUDE[ciphername_test]=../include ../apps/include
   DEPEND[ciphername_test]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[servername_test]=servername_test.c ssltestlib.c
-  INCLUDE[servername_test]=../include
+  INCLUDE[servername_test]=../include ../apps/include
   DEPEND[servername_test]=../libcrypto ../libssl libtestutil.a
 
   IF[{- !$disabled{cms} -}]
     PROGRAMS{noinst}=cmsapitest
     SOURCE[cmsapitest]=cmsapitest.c
-    INCLUDE[cmsapitest]=../include
+    INCLUDE[cmsapitest]=../include ../apps/include
     DEPEND[cmsapitest]=../libcrypto libtestutil.a
   ENDIF
 
   IF[{- !$disabled{psk} -}]
     PROGRAMS{noinst}=dtls_mtu_test
     SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c
-    INCLUDE[dtls_mtu_test]=.. ../include
+    INCLUDE[dtls_mtu_test]=.. ../include ../apps/include
     DEPEND[dtls_mtu_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
   IF[{- !$disabled{shared} -}]
     PROGRAMS{noinst}=shlibloadtest
     SOURCE[shlibloadtest]=shlibloadtest.c
-    INCLUDE[shlibloadtest]=../include ../crypto/include
+    INCLUDE[shlibloadtest]=../include ../apps/include ../crypto/include
   ENDIF
 
   IF[{- $disabled{shared} -}]
     PROGRAMS{noinst}=cipher_overhead_test
     SOURCE[cipher_overhead_test]=cipher_overhead_test.c
-    INCLUDE[cipher_overhead_test]=.. ../include
+    INCLUDE[cipher_overhead_test]=.. ../include ../apps/include
     DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
   SOURCE[uitest]=uitest.c ../apps/apps_ui.c
-  INCLUDE[uitest]=.. ../include ../apps
+  INCLUDE[uitest]=.. ../include ../apps/include
   DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[cipherbytes_test]=cipherbytes_test.c
-  INCLUDE[cipherbytes_test]=../include
+  INCLUDE[cipherbytes_test]=../include ../apps/include
   DEPEND[cipherbytes_test]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[asn1_encode_test]=asn1_encode_test.c
-  INCLUDE[asn1_encode_test]=../include
+  INCLUDE[asn1_encode_test]=../include ../apps/include
   DEPEND[asn1_encode_test]=../libcrypto libtestutil.a
 
   SOURCE[asn1_decode_test]=asn1_decode_test.c
-  INCLUDE[asn1_decode_test]=../include
+  INCLUDE[asn1_decode_test]=../include ../apps/include
   DEPEND[asn1_decode_test]=../libcrypto libtestutil.a
 
   SOURCE[asn1_string_table_test]=asn1_string_table_test.c
-  INCLUDE[asn1_string_table_test]=../include
+  INCLUDE[asn1_string_table_test]=../include ../apps/include
   DEPEND[asn1_string_table_test]=../libcrypto libtestutil.a
 
   SOURCE[time_offset_test]=time_offset_test.c
-  INCLUDE[time_offset_test]=../include
+  INCLUDE[time_offset_test]=../include ../apps/include
   DEPEND[time_offset_test]=../libcrypto libtestutil.a
 
   SOURCE[conf_include_test]=conf_include_test.c
-  INCLUDE[conf_include_test]=../include
+  INCLUDE[conf_include_test]=../include ../apps/include
   DEPEND[conf_include_test]=../libcrypto libtestutil.a
 
   # Internal test programs.  These are essentially a collection of internal
@@ -457,59 +457,59 @@ IF[{- !$disabled{tests} -}]
     ENDIF
 
     SOURCE[poly1305_internal_test]=poly1305_internal_test.c
-    INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
+    INCLUDE[poly1305_internal_test]=.. ../include ../apps/include ../crypto/include
     DEPEND[poly1305_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[chacha_internal_test]=chacha_internal_test.c
-    INCLUDE[chacha_internal_test]=.. ../include ../crypto/include
+    INCLUDE[chacha_internal_test]=.. ../include ../apps/include ../crypto/include
     DEPEND[chacha_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[asn1_internal_test]=asn1_internal_test.c
-    INCLUDE[asn1_internal_test]=.. ../include ../crypto/include
+    INCLUDE[asn1_internal_test]=.. ../include ../apps/include ../crypto/include
     DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[modes_internal_test]=modes_internal_test.c
-    INCLUDE[modes_internal_test]=.. ../include
+    INCLUDE[modes_internal_test]=.. ../include ../apps/include
     DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[x509_internal_test]=x509_internal_test.c
-    INCLUDE[x509_internal_test]=.. ../include
+    INCLUDE[x509_internal_test]=.. ../include ../apps/include
     DEPEND[x509_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[tls13encryptiontest]=tls13encryptiontest.c
-    INCLUDE[tls13encryptiontest]=.. ../include
+    INCLUDE[tls13encryptiontest]=.. ../include ../apps/include
     DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a libtestutil.a
 
     SOURCE[wpackettest]=wpackettest.c
-    INCLUDE[wpackettest]=../include
+    INCLUDE[wpackettest]=../include ../apps/include
     DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
 
     SOURCE[ctype_internal_test]=ctype_internal_test.c
-    INCLUDE[ctype_internal_test]=.. ../crypto/include ../include
+    INCLUDE[ctype_internal_test]=.. ../crypto/include ../include ../apps/include
     DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[sparse_array_test]=sparse_array_test.c
-    INCLUDE[sparse_array_test]=../crypto/include ../include
+    INCLUDE[sparse_array_test]=../crypto/include ../include ../apps/include
     DEPEND[sparse_array_test]=../libcrypto.a libtestutil.a
 
     SOURCE[siphash_internal_test]=siphash_internal_test.c
-    INCLUDE[siphash_internal_test]=.. ../include ../crypto/include
+    INCLUDE[siphash_internal_test]=.. ../include ../apps/include ../crypto/include
     DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[sm2_internal_test]=sm2_internal_test.c
-    INCLUDE[sm2_internal_test]=../include ../crypto/include
+    INCLUDE[sm2_internal_test]=../include ../apps/include ../crypto/include
     DEPEND[sm2_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[sm4_internal_test]=sm4_internal_test.c
-    INCLUDE[sm4_internal_test]=.. ../include ../crypto/include
+    INCLUDE[sm4_internal_test]=.. ../include ../apps/include ../crypto/include
     DEPEND[sm4_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[curve448_internal_test]=curve448_internal_test.c
-    INCLUDE[curve448_internal_test]=.. ../include ../crypto/ec/curve448
+    INCLUDE[curve448_internal_test]=.. ../include ../apps/include ../crypto/ec/curve448
     DEPEND[curve448_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[rdrand_sanitytest]=rdrand_sanitytest.c
-    INCLUDE[rdrand_sanitytest]=../include
+    INCLUDE[rdrand_sanitytest]=../include ../apps/include
     DEPEND[rdrand_sanitytest]=../libcrypto.a libtestutil.a
   ENDIF
 
@@ -518,12 +518,12 @@ IF[{- !$disabled{tests} -}]
   ENDIF
 
   SOURCE[mdc2_internal_test]=mdc2_internal_test.c
-  INCLUDE[mdc2_internal_test]=.. ../include
+  INCLUDE[mdc2_internal_test]=.. ../include ../apps/include
   DEPEND[mdc2_internal_test]=../libcrypto libtestutil.a
 
   PROGRAMS{noinst}=asn1_time_test
   SOURCE[asn1_time_test]=asn1_time_test.c
-  INCLUDE[asn1_time_test]=../include
+  INCLUDE[asn1_time_test]=../include ../apps/include
   DEPEND[asn1_time_test]=../libcrypto libtestutil.a
 
   # We disable this test completely in a shared build because it deliberately
@@ -533,24 +533,24 @@ IF[{- !$disabled{tests} -}]
     PROGRAMS{noinst}=tls13secretstest
     SOURCE[tls13secretstest]=tls13secretstest.c
     SOURCE[tls13secretstest]= ../ssl/tls13_enc.c ../ssl/packet.c
-    INCLUDE[tls13secretstest]=.. ../include
+    INCLUDE[tls13secretstest]=.. ../include ../apps/include
     DEPEND[tls13secretstest]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
   SOURCE[sslbuffertest]=sslbuffertest.c ssltestlib.c
-  INCLUDE[sslbuffertest]=../include
+  INCLUDE[sslbuffertest]=../include ../apps/include
   DEPEND[sslbuffertest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[sysdefaulttest]=sysdefaulttest.c
-  INCLUDE[sysdefaulttest]=../include
+  INCLUDE[sysdefaulttest]=../include ../apps/include
   DEPEND[sysdefaulttest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[errtest]=errtest.c
-  INCLUDE[errtest]=../include
+  INCLUDE[errtest]=../include ../apps/include
   DEPEND[errtest]=../libcrypto libtestutil.a
 
   SOURCE[gosttest]=gosttest.c ssltestlib.c
-  INCLUDE[gosttest]=../include ..
+  INCLUDE[gosttest]=../include ../apps/include ..
   DEPEND[gosttest]=../libcrypto ../libssl libtestutil.a
 ENDIF
 
diff --git a/test/testutil.h b/test/testutil.h
index 9e08a42..ec2f532 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -15,7 +15,7 @@
 #include <openssl/err.h>
 #include <openssl/e_os2.h>
 #include <openssl/bn.h>
-#include "../apps/opt.h"
+#include "opt.h"
 
 /*-
  * Simple unit tests should implement setup_tests().