Switch to fully-qualified #include

Previously, mosh used extensive -I flags and all of the mosh-local
makes it really hard to tell what the proper dependency graph is, so
instead remove the -I arguments in favvor of $(top_srcdir) and qualify
the paths wherever they are used.

src/crypto/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../util $(CRYPTO_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/ $(CRYPTO_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
 noinst_LIBRARIES = libmoshcrypto.a

src/crypto/base64.cc

@@ -33,8 +33,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "fatal_assert.h"
-#include "base64.h"
+#include "src/util/fatal_assert.h"
+#include "src/crypto/base64.h"
 
 static const char table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 

src/crypto/byteorder.h

@@ -33,7 +33,7 @@
 #ifndef BYTEORDER_HPP
 #define BYTEORDER_HPP
 
-#include "config.h"
+#include "src/include/config.h"
 
 #if HAVE_DECL_BE64TOH || HAVE_DECL_BETOH64
 

src/crypto/crypto.cc

@@ -38,11 +38,11 @@
 #include <sys/resource.h>
 #include <fstream>
 
-#include "byteorder.h"
-#include "crypto.h"
-#include "base64.h"
-#include "fatal_assert.h"
-#include "prng.h"
+#include "src/crypto/byteorder.h"
+#include "src/crypto/crypto.h"
+#include "src/crypto/base64.h"
+#include "src/util/fatal_assert.h"
+#include "src/crypto/prng.h"
 
 using namespace Crypto;
 

src/crypto/crypto.h

@@ -33,7 +33,7 @@
 #ifndef CRYPTO_HPP
 #define CRYPTO_HPP
 
-#include "ae.h"
+#include "src/crypto/ae.h"
 #include <string>
 #include <string.h>
 #include <stdint.h>

src/crypto/ocb_internal.cc

@@ -24,7 +24,7 @@
 / Comments are welcome: Ted Krovetz <ted@krovetz.net> - Dedicated to Laurel K
 /------------------------------------------------------------------------- */
 
-#include "config.h"
+#include "src/include/config.h"
 
 /* This module implements the ae.h interface for OpenSSL, Apple Common
 /  Crypto, and Nettle.                                                     */
@@ -84,9 +84,9 @@
 /* Includes and compiler specific definitions                              */
 /* ----------------------------------------------------------------------- */
 
-#include "ae.h"
-#include "crypto.h"
-#include "fatal_assert.h"
+#include "src/crypto/ae.h"
+#include "src/crypto/crypto.h"
+#include "src/util/fatal_assert.h"
 #include <stdlib.h>
 #include <string.h>
 #if defined(HAVE_STRINGS_H)

src/crypto/ocb_openssl.cc

@@ -1,5 +1,5 @@
-#include "config.h"
-#include "ae.h"
+#include "src/include/config.h"
+#include "src/crypto/ae.h"
 
 #include <cstring>
 #include <openssl/crypto.h>

src/crypto/prng.h

@@ -37,7 +37,7 @@
 #include <stdint.h>
 #include <fstream>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 /* Read random bytes from /dev/urandom.
 

src/examples/Makefile.am

@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/ $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
 AM_LDFLAGS  = $(HARDEN_LDFLAGS)
 
 if BUILD_EXAMPLES

src/examples/benchmark.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <errno.h>
 #include <locale.h>
@@ -52,12 +52,12 @@
 #include <util.h>
 #endif
 
-#include "swrite.h"
-#include "completeterminal.h"
-#include "user.h"
-#include "terminaloverlay.h"
-#include "locale_utils.h"
-#include "fatal_assert.h"
+#include "src/util/swrite.h"
+#include "src/statesync/completeterminal.h"
+#include "src/statesync/user.h"
+#include "src/frontend/terminaloverlay.h"
+#include "src/util/locale_utils.h"
+#include "src/util/fatal_assert.h"
 
 const int ITERATIONS = 100000;
 

src/examples/decrypt.cc

@@ -34,7 +34,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 using namespace Crypto;
 

src/examples/encrypt.cc

@@ -34,7 +34,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 using namespace Crypto;
 

src/examples/ntester.cc

@@ -33,12 +33,12 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "user.h"
-#include "fatal_assert.h"
-#include "pty_compat.h"
-#include "networktransport-impl.h"
-#include "select.h"
-#include "shared.h"
+#include "src/statesync/user.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/pty_compat.h"
+#include "src/network/networktransport-impl.h"
+#include "src/util/select.h"
+#include "src/util/shared.h"
 
 using namespace Network;
 

src/examples/parse.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <unistd.h>
 #include <stdio.h>
@@ -53,12 +53,12 @@
 #include <libutil.h>
 #endif
 
-#include "parser.h"
-#include "swrite.h"
-#include "locale_utils.h"
-#include "fatal_assert.h"
-#include "pty_compat.h"
-#include "select.h"
+#include "src/terminal/parser.h"
+#include "src/util/swrite.h"
+#include "src/util/locale_utils.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/pty_compat.h"
+#include "src/util/select.h"
 
 const size_t buf_size = 1024;
 

src/examples/termemu.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <unistd.h>
 #include <stdio.h>
@@ -60,13 +60,13 @@
 #include <libutil.h>
 #endif
 
-#include "parser.h"
-#include "completeterminal.h"
-#include "swrite.h"
-#include "fatal_assert.h"
-#include "pty_compat.h"
-#include "locale_utils.h"
-#include "select.h"
+#include "src/terminal/parser.h"
+#include "src/statesync/completeterminal.h"
+#include "src/util/swrite.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/pty_compat.h"
+#include "src/util/locale_utils.h"
+#include "src/util/select.h"
 
 const size_t buf_size = 16384;
 

src/frontend/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/ $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 AM_LDFLAGS  = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS)
 LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS)

src/frontend/mosh-client.cc

@@ -30,16 +30,16 @@
     also delete it here.
 */
 
-#include "config.h"
-#include "version.h"
+#include "src/include/config.h"
+#include "src/include/version.h"
 
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "stmclient.h"
-#include "crypto.h"
-#include "locale_utils.h"
-#include "fatal_assert.h"
+#include "src/crypto/crypto.h"
+#include "src/util/locale_utils.h"
+#include "src/util/fatal_assert.h"
 
 /* These need to be included last because of conflicting defines. */
 /*

src/frontend/mosh-server.cc

@@ -30,8 +30,8 @@
     also delete it here.
 */
 
-#include "config.h"
-#include "version.h"
+#include "src/include/config.h"
+#include "src/include/version.h"
 
 #include <err.h>
 #include <errno.h>
@@ -79,21 +79,21 @@
 #include <libutil.h>
 #endif
 
-#include "completeterminal.h"
-#include "swrite.h"
-#include "user.h"
-#include "fatal_assert.h"
-#include "locale_utils.h"
-#include "pty_compat.h"
-#include "select.h"
-#include "timestamp.h"
-#include "fatal_assert.h"
+#include "src/statesync/completeterminal.h"
+#include "src/util/swrite.h"
+#include "src/statesync/user.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/locale_utils.h"
+#include "src/util/pty_compat.h"
+#include "src/util/select.h"
+#include "src/util/timestamp.h"
+#include "src/util/fatal_assert.h"
 
 #ifndef _PATH_BSHELL
 #define _PATH_BSHELL "/bin/sh"
 #endif
 
-#include "networktransport-impl.h"
+#include "src/network/networktransport-impl.h"
 
 typedef Network::Transport< Terminal::Complete, Network::UserStream > ServerConnection;
 

src/frontend/stmclient.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <err.h>
 #include <errno.h>
@@ -52,16 +52,16 @@
 #endif
 
 #include "stmclient.h"
-#include "swrite.h"
-#include "completeterminal.h"
-#include "user.h"
-#include "fatal_assert.h"
-#include "locale_utils.h"
-#include "pty_compat.h"
-#include "select.h"
-#include "timestamp.h"
+#include "src/util/swrite.h"
+#include "src/statesync/completeterminal.h"
+#include "src/statesync/user.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/locale_utils.h"
+#include "src/util/pty_compat.h"
+#include "src/util/select.h"
+#include "src/util/timestamp.h"
 
-#include "networktransport-impl.h"
+#include "src/network/networktransport-impl.h"
 
 using std::wstring;
 

src/frontend/stmclient.h

@@ -37,11 +37,11 @@
 #include <termios.h>
 #include <string>
 
-#include "completeterminal.h"
-#include "networktransport.h"
-#include "user.h"
-#include "shared.h"
-#include "terminaloverlay.h"
+#include "src/statesync/completeterminal.h"
+#include "src/network/networktransport.h"
+#include "src/statesync/user.h"
+#include "src/util/shared.h"
+#include "src/frontend/terminaloverlay.h"
 
 class STMClient {
 private:

src/frontend/terminaloverlay.cc

@@ -36,7 +36,7 @@
 #include <typeinfo>
 #include <limits.h>
 
-#include "terminaloverlay.h"
+#include "src/frontend/terminaloverlay.h"
 
 using namespace Overlay;
 

src/frontend/terminaloverlay.h

@@ -33,10 +33,10 @@
 #ifndef TERMINAL_OVERLAY_HPP
 #define TERMINAL_OVERLAY_HPP
 
-#include "terminalframebuffer.h"
-#include "network.h"
-#include "transportsender.h"
-#include "parser.h"
+#include "src/terminal/terminalframebuffer.h"
+#include "src/network/network.h"
+#include "src/network/transportsender.h"
+#include "src/terminal/parser.h"
 
 #include <vector>
 #include <limits.h>

src/fuzz/Makefile.am

@@ -4,10 +4,10 @@ if ENABLE_FUZZING
   noinst_PROGRAMS = terminal_parser_fuzzer terminal_fuzzer
 endif
 
-terminal_parser_fuzzer_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util
+terminal_parser_fuzzer_CPPFLAGS = -I$(top_srcdir)/
 terminal_parser_fuzzer_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a
 terminal_parser_fuzzer_SOURCES = terminal_parser_fuzzer.cc
 
-terminal_fuzzer_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs
+terminal_fuzzer_CPPFLAGS = -I$(top_srcdir)/
 terminal_fuzzer_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a $(TINFO_LIBS) $(protobuf_LIBS)
 terminal_fuzzer_SOURCES = terminal_fuzzer.cc

src/fuzz/terminal_fuzzer.cc

@@ -1,8 +1,8 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "parser.h"
-#include "completeterminal.h"
+#include "src/terminal/parser.h"
+#include "src/statesync/completeterminal.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   Terminal::Display display(false);

src/fuzz/terminal_parser_fuzzer.cc

@@ -1,7 +1,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "parser.h"
+#include "src/terminal/parser.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   Parser::UTF8Parser parser;

src/network/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../crypto -I../protobufs $(protobuf_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/ $(protobuf_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
 noinst_LIBRARIES = libmoshnetwork.a

src/network/compressor.cc

@@ -33,7 +33,7 @@
 #include <zlib.h>
 
 #include "compressor.h"
-#include "dos_assert.h"
+#include "src/util/dos_assert.h"
 
 using namespace Network;
 using std::string;

src/network/network.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -44,13 +44,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "dos_assert.h"
-#include "fatal_assert.h"
-#include "byteorder.h"
-#include "network.h"
-#include "crypto.h"
+#include "src/util/dos_assert.h"
+#include "src/util/fatal_assert.h"
+#include "src/crypto/byteorder.h"
+#include "src/network/network.h"
+#include "src/crypto/crypto.h"
 
-#include "timestamp.h"
+#include "src/util/timestamp.h"
 
 #ifndef MSG_DONTWAIT
 #define MSG_DONTWAIT MSG_NONBLOCK

src/network/network.h

@@ -44,7 +44,7 @@
 #include <exception>
 #include <string.h>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 using namespace Crypto;
 

src/network/networktransport-impl.h

@@ -33,7 +33,7 @@
 #ifndef NETWORK_TRANSPORT_IMPL_HPP
 #define NETWORK_TRANSPORT_IMPL_HPP
 
-#include "networktransport.h"
+#include "src/network/networktransport.h"
 
 #include "transportsender-impl.h"
 

src/network/networktransport.h

@@ -39,8 +39,8 @@
 #include <list>
 #include <vector>
 
-#include "network.h"
-#include "transportsender.h"
+#include "src/network/network.h"
+#include "src/network/transportsender.h"
 #include "transportfragment.h"
 
 

src/network/transportfragment.cc

@@ -32,11 +32,11 @@
 
 #include <assert.h>
 
-#include "byteorder.h"
+#include "src/crypto/byteorder.h"
 #include "transportfragment.h"
-#include "transportinstruction.pb.h"
+#include "src/protobufs/transportinstruction.pb.h"
 #include "compressor.h"
-#include "fatal_assert.h"
+#include "src/util/fatal_assert.h"
 
 using namespace Network;
 using namespace TransportBuffers;

src/network/transportfragment.h

@@ -37,7 +37,7 @@
 #include <vector>
 #include <string>
 
-#include "transportinstruction.pb.h"
+#include "src/protobufs/transportinstruction.pb.h"
 
 namespace Network {
   using std::vector;

src/network/transportsender-impl.h

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "transportsender.h"
+#include "src/network/transportsender.h"
 #include "transportfragment.h"
 
 #include <limits.h>

src/network/transportsender.h

@@ -37,11 +37,11 @@
 #include <string>
 #include <list>
 
-#include "network.h"
-#include "transportinstruction.pb.h"
+#include "src/network/network.h"
+#include "src/protobufs/transportinstruction.pb.h"
 #include "transportstate.h"
 #include "transportfragment.h"
-#include "prng.h"
+#include "src/crypto/prng.h"
 
 namespace Network {
   using std::list;

src/statesync/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../terminal -I../protobufs $(protobuf_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/ $(protobuf_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
 noinst_LIBRARIES = libmoshstatesync.a

src/statesync/completeterminal.cc

@@ -30,10 +30,10 @@
     also delete it here.
 */
 
-#include "completeterminal.h"
-#include "fatal_assert.h"
+#include "src/statesync/completeterminal.h"
+#include "src/util/fatal_assert.h"
 
-#include "hostinput.pb.h"
+#include "src/protobufs/hostinput.pb.h"
 
 #include <limits.h>
 

src/statesync/completeterminal.h

@@ -36,8 +36,8 @@
 #include <list>
 #include <stdint.h>
 
-#include "parser.h"
-#include "terminal.h"
+#include "src/terminal/parser.h"
+#include "src/terminal/terminal.h"
 
 /* This class represents the complete terminal -- a UTF8Parser feeding Actions to an Emulator. */
 

src/statesync/user.cc

@@ -33,9 +33,9 @@
 #include <assert.h>
 #include <typeinfo>
 
-#include "user.h"
-#include "fatal_assert.h"
-#include "userinput.pb.h"
+#include "src/statesync/user.h"
+#include "src/util/fatal_assert.h"
+#include "src/protobufs/userinput.pb.h"
 
 using namespace Parser;
 using namespace Network;

src/statesync/user.h

@@ -38,7 +38,7 @@
 #include <string>
 #include <assert.h>
 
-#include "parseraction.h"
+#include "src/terminal/parseraction.h"
 
 namespace Network {
   using std::deque;

src/terminal/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../util $(TINFO_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/ $(TINFO_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
 noinst_LIBRARIES = libmoshterminal.a

src/terminal/parser.cc

@@ -36,7 +36,7 @@
 #include <wchar.h>
 #include <stdint.h>
 
-#include "parser.h"
+#include "src/terminal/parser.h"
 
 const Parser::StateFamily Parser::family;
 

src/terminal/parser.h

@@ -40,7 +40,7 @@
 #include <string.h>
 
 #include "parsertransition.h"
-#include "parseraction.h"
+#include "src/terminal/parseraction.h"
 #include "parserstate.h"
 #include "parserstatefamily.h"
 

src/terminal/parseraction.cc

@@ -33,8 +33,8 @@
 #include <stdio.h>
 #include <wctype.h>
 
-#include "parseraction.h"
-#include "terminal.h"
+#include "src/terminal/parseraction.h"
+#include "src/terminal/terminal.h"
 
 using namespace Parser;
 

src/terminal/parseraction.h

@@ -36,7 +36,7 @@
 #include <string>
 #include <vector>
 
-#include "shared.h"
+#include "src/util/shared.h"
 
 namespace Terminal {
   class Emulator;

src/terminal/parserstate.cc

@@ -32,7 +32,7 @@
 
 #include "parserstate.h"
 #include "parserstatefamily.h"
-#include "shared.h"
+#include "src/util/shared.h"
 
 using namespace Parser;
 

src/terminal/parsertransition.h

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "parseraction.h"
+#include "src/terminal/parseraction.h"
 
 namespace Parser {
   class State;

src/terminal/terminal.cc

@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <typeinfo>
 
-#include "terminal.h"
+#include "src/terminal/terminal.h"
 
 using namespace Terminal;
 

src/terminal/terminal.h

@@ -38,8 +38,8 @@
 #include <vector>
 #include <deque>
 
-#include "parseraction.h"
-#include "terminalframebuffer.h"
+#include "src/terminal/parseraction.h"
+#include "src/terminal/terminalframebuffer.h"
 #include "terminaldispatcher.h"
 #include "terminaluserinput.h"
 #include "terminaldisplay.h"

src/terminal/terminaldispatcher.cc

@@ -37,8 +37,8 @@
 #include <stdlib.h>
 
 #include "terminaldispatcher.h"
-#include "parseraction.h"
-#include "terminalframebuffer.h"
+#include "src/terminal/parseraction.h"
+#include "src/terminal/terminalframebuffer.h"
 
 using namespace Terminal;
 

src/terminal/terminaldisplay.cc

@@ -33,7 +33,7 @@
 #include <stdio.h>
 
 #include "terminaldisplay.h"
-#include "terminalframebuffer.h"
+#include "src/terminal/terminalframebuffer.h"
 
 using namespace Terminal;
 

src/terminal/terminaldisplay.h

@@ -33,7 +33,7 @@
 #ifndef TERMINALDISPLAY_HPP
 #define TERMINALDISPLAY_HPP
 
-#include "terminalframebuffer.h"
+#include "src/terminal/terminalframebuffer.h"
 
 namespace Terminal {
   /* variables used within a new_frame */

src/terminal/terminaldisplayinit.cc

@@ -33,7 +33,7 @@
 /* This is in its own file because otherwise the ncurses #defines
    alias our own variable names. */
 
-#include "config.h"
+#include "src/include/config.h"
 #include "terminaldisplay.h"
 
 #include <string>

src/terminal/terminalframebuffer.cc

@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "terminalframebuffer.h"
+#include "src/terminal/terminalframebuffer.h"
 
 using namespace Terminal;
 

src/terminal/terminalframebuffer.h

@@ -42,7 +42,7 @@
 #include <string>
 #include <list>
 
-#include "shared.h"
+#include "src/util/shared.h"
 
 /* Terminal framebuffer */
 

src/terminal/terminalfunctions.cc

@@ -36,8 +36,8 @@
 #include <stdio.h>
 
 #include "terminaldispatcher.h"
-#include "terminalframebuffer.h"
-#include "parseraction.h"
+#include "src/terminal/terminalframebuffer.h"
+#include "src/terminal/parseraction.h"
 
 using namespace Terminal;
 

src/terminal/terminaluserinput.h

@@ -34,7 +34,7 @@
 #define TERMINALUSERINPUT_HPP
 
 #include <string>
-#include "parseraction.h"
+#include "src/terminal/parseraction.h"
 
 namespace Terminal {
   class UserInput {

src/tests/Makefile.am

@@ -7,7 +7,7 @@ EXTRA_DIST = \
 	$(displaytests) \
 	emulation-attributes.test
 
-AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/ $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 AM_LDFLAGS  = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS)
 
 displaytests = \

src/tests/base64.cc

@@ -41,11 +41,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "base64.h"
+#include "src/crypto/base64.h"
 #include "base64_vector.h"
-#include "crypto.h"
-#include "prng.h"
-#include "fatal_assert.h"
+#include "src/crypto/crypto.h"
+#include "src/crypto/prng.h"
+#include "src/util/fatal_assert.h"
 // #include "test_utils.h"
 
 #define KEY_LEN   16

src/tests/encrypt-decrypt.cc

@@ -39,9 +39,9 @@
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
-#include "crypto.h"
-#include "prng.h"
-#include "fatal_assert.h"
+#include "src/crypto/crypto.h"
+#include "src/crypto/prng.h"
+#include "src/util/fatal_assert.h"
 #include "test_utils.h"
 
 using namespace Crypto;

src/tests/inpty.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -52,8 +52,8 @@
 #include <libutil.h>
 #endif
 
-#include "pty_compat.h"
-#include "swrite.h"
+#include "src/util/pty_compat.h"
+#include "src/util/swrite.h"
 
 int main( int argc, char *argv[] )
 {

src/tests/is-utf8-locale.cc

@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 
-#include "locale_utils.h"
+#include "src/util/locale_utils.h"
 
 int main( int argc __attribute__(( unused )), char **argv __attribute__(( unused )))
 {

src/tests/nonce-incr.cc

@@ -36,7 +36,7 @@
 #include <cstdlib>
 #include <set>
 
-#include "network.h"
+#include "src/network/network.h"
 
 int main()
 {

src/tests/ocb-aes.cc

@@ -41,12 +41,12 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "ae.h"
-#include "crypto.h"
-#include "prng.h"
-#include "fatal_assert.h"
+#include "src/crypto/ae.h"
+#include "src/crypto/crypto.h"
+#include "src/crypto/prng.h"
+#include "src/util/fatal_assert.h"
 #include "test_utils.h"
-#include "shared.h"
+#include "src/util/shared.h"
 
 #define KEY_LEN   16
 #define NONCE_LEN 12

src/tests/test_utils.h

@@ -35,7 +35,7 @@
 
 #include <string>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 #define DUMP_NAME_FMT "%-10s "
 

src/util/Makefile.am

@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/ $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
 noinst_LIBRARIES = libmoshutil.a
 

src/util/dos_assert.h

@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 static void dos_detected( const char *expression, const char *file, int line, const char *function )
 {

src/util/locale_utils.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -43,7 +43,7 @@
 #include <langinfo.h>
 #endif
 
-#include "locale_utils.h"
+#include "src/util/locale_utils.h"
 
 
 const std::string LocaleVar::str( void ) const

src/util/pty_compat.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #if !defined(HAVE_FORKPTY) || !defined(HAVE_CFMAKERAW)
 #include <stdio.h>
@@ -42,7 +42,7 @@
 #include <sys/stropts.h>
 #include <termios.h>
 
-#include "pty_compat.h"
+#include "src/util/pty_compat.h"
 
 #ifndef HAVE_FORKPTY
 pid_t my_forkpty( int *amaster, char *name,

src/util/pty_compat.h

@@ -33,7 +33,7 @@
 #ifndef PTY_COMPAT_HPP
 #define PTY_COMPAT_HPP
 
-#include "config.h"
+#include "src/include/config.h"
 
 #ifndef HAVE_FORKPTY
 #  define forkpty my_forkpty

src/util/select.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "select.h"
+#include "src/util/select.h"
 
 fd_set Select::dummy_fd_set;
 

src/util/select.h

@@ -39,8 +39,8 @@
 #include <sys/select.h>
 #include <assert.h>
 
-#include "fatal_assert.h"
-#include "timestamp.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/timestamp.h"
 
 /* Convenience wrapper for pselect(2).
 

src/util/shared.h

@@ -33,7 +33,7 @@
 #ifndef SHARED_HPP
 #define SHARED_HPP
 
-#include "config.h"
+#include "src/include/config.h"
 
 #ifdef HAVE_MEMORY
 #include <memory>

src/util/swrite.cc

@@ -34,7 +34,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "swrite.h"
+#include "src/util/swrite.h"
 
 int swrite( int fd, const char *str, ssize_t len )
 {

src/util/timestamp.cc

@@ -30,9 +30,9 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
-#include "timestamp.h"
+#include "src/util/timestamp.h"
 
 #include <errno.h>