diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am index 2757f706..876eb298 100644 --- a/src/libguac/Makefile.am +++ b/src/libguac/Makefile.am @@ -122,7 +122,7 @@ libguacinc_HEADERS += guacamole/socket-wsa.h endif libguac_la_CFLAGS = \ - -Werror -Wall -pedantic -I$(srcdir)/guacamole + -Werror -Wall -pedantic libguac_la_LDFLAGS = \ -version-info 16:0:0 \ diff --git a/src/libguac/audio.c b/src/libguac/audio.c index cf0187a2..cc577c71 100644 --- a/src/libguac/audio.c +++ b/src/libguac/audio.c @@ -19,14 +19,13 @@ #include "config.h" +#include "guacamole/audio.h" +#include "guacamole/client.h" +#include "guacamole/protocol.h" +#include "guacamole/stream.h" +#include "guacamole/user.h" #include "raw_encoder.h" -#include -#include -#include -#include -#include - #include #include diff --git a/src/libguac/client.c b/src/libguac/client.c index 4f3051d9..71cffda8 100644 --- a/src/libguac/client.c +++ b/src/libguac/client.c @@ -19,20 +19,20 @@ #include "config.h" -#include "client.h" #include "encode-jpeg.h" #include "encode-png.h" #include "encode-webp.h" -#include "error.h" +#include "guacamole/client.h" +#include "guacamole/error.h" +#include "guacamole/layer.h" +#include "guacamole/plugin.h" +#include "guacamole/pool.h" +#include "guacamole/protocol.h" +#include "guacamole/socket.h" +#include "guacamole/stream.h" +#include "guacamole/timestamp.h" +#include "guacamole/user.h" #include "id.h" -#include "layer.h" -#include "pool.h" -#include "plugin.h" -#include "protocol.h" -#include "socket.h" -#include "stream.h" -#include "timestamp.h" -#include "user.h" #include #include diff --git a/src/libguac/encode-jpeg.c b/src/libguac/encode-jpeg.c index 5a869c72..1aeb23bb 100644 --- a/src/libguac/encode-jpeg.c +++ b/src/libguac/encode-jpeg.c @@ -20,10 +20,10 @@ #include "config.h" #include "encode-jpeg.h" -#include "error.h" +#include "guacamole/error.h" +#include "guacamole/protocol.h" +#include "guacamole/stream.h" #include "palette.h" -#include "protocol.h" -#include "stream.h" #include #include diff --git a/src/libguac/encode-jpeg.h b/src/libguac/encode-jpeg.h index d791ea69..05cf2cad 100644 --- a/src/libguac/encode-jpeg.h +++ b/src/libguac/encode-jpeg.h @@ -22,8 +22,8 @@ #include "config.h" -#include "socket.h" -#include "stream.h" +#include "guacamole/socket.h" +#include "guacamole/stream.h" #include diff --git a/src/libguac/encode-png.c b/src/libguac/encode-png.c index 78795577..7d4b6c7f 100644 --- a/src/libguac/encode-png.c +++ b/src/libguac/encode-png.c @@ -20,10 +20,10 @@ #include "config.h" #include "encode-png.h" -#include "error.h" +#include "guacamole/error.h" +#include "guacamole/protocol.h" +#include "guacamole/stream.h" #include "palette.h" -#include "protocol.h" -#include "stream.h" #include #include diff --git a/src/libguac/encode-png.h b/src/libguac/encode-png.h index 916493c4..222c50ef 100644 --- a/src/libguac/encode-png.h +++ b/src/libguac/encode-png.h @@ -22,8 +22,8 @@ #include "config.h" -#include "socket.h" -#include "stream.h" +#include "guacamole/socket.h" +#include "guacamole/stream.h" #include diff --git a/src/libguac/encode-webp.c b/src/libguac/encode-webp.c index 88534db5..5c2237d6 100644 --- a/src/libguac/encode-webp.c +++ b/src/libguac/encode-webp.c @@ -20,10 +20,10 @@ #include "config.h" #include "encode-webp.h" -#include "error.h" +#include "guacamole/error.h" +#include "guacamole/protocol.h" +#include "guacamole/stream.h" #include "palette.h" -#include "protocol.h" -#include "stream.h" #include #include diff --git a/src/libguac/encode-webp.h b/src/libguac/encode-webp.h index 8971765c..5347f6d9 100644 --- a/src/libguac/encode-webp.h +++ b/src/libguac/encode-webp.h @@ -22,8 +22,8 @@ #include "config.h" -#include "socket.h" -#include "stream.h" +#include "guacamole/socket.h" +#include "guacamole/stream.h" #include diff --git a/src/libguac/error.c b/src/libguac/error.c index 95942e81..5561b178 100644 --- a/src/libguac/error.c +++ b/src/libguac/error.c @@ -19,7 +19,7 @@ #include "config.h" -#include "error.h" +#include "guacamole/error.h" #include #include diff --git a/src/libguac/id.c b/src/libguac/id.c index 56ef23c2..27a714c0 100644 --- a/src/libguac/id.c +++ b/src/libguac/id.c @@ -19,8 +19,8 @@ #include "config.h" +#include "guacamole/error.h" #include "id.h" -#include "error.h" #ifdef HAVE_OSSP_UUID_H #include diff --git a/src/libguac/parser.c b/src/libguac/parser.c index 799b48ab..9645a2a3 100644 --- a/src/libguac/parser.c +++ b/src/libguac/parser.c @@ -19,10 +19,10 @@ #include "config.h" -#include "error.h" -#include "parser.h" -#include "socket.h" -#include "unicode.h" +#include "guacamole/error.h" +#include "guacamole/parser.h" +#include "guacamole/socket.h" +#include "guacamole/unicode.h" #include #include diff --git a/src/libguac/pool.c b/src/libguac/pool.c index 363c239d..9db43ada 100644 --- a/src/libguac/pool.c +++ b/src/libguac/pool.c @@ -19,7 +19,7 @@ #include "config.h" -#include "pool.h" +#include "guacamole/pool.h" #include diff --git a/src/libguac/protocol.c b/src/libguac/protocol.c index dba9c56e..ee266e87 100644 --- a/src/libguac/protocol.c +++ b/src/libguac/protocol.c @@ -19,14 +19,14 @@ #include "config.h" -#include "error.h" -#include "layer.h" -#include "object.h" +#include "guacamole/error.h" +#include "guacamole/layer.h" +#include "guacamole/object.h" +#include "guacamole/protocol.h" +#include "guacamole/socket.h" +#include "guacamole/stream.h" +#include "guacamole/unicode.h" #include "palette.h" -#include "protocol.h" -#include "socket.h" -#include "stream.h" -#include "unicode.h" #include diff --git a/src/libguac/raw_encoder.c b/src/libguac/raw_encoder.c index 1dd03cc4..9086a37b 100644 --- a/src/libguac/raw_encoder.c +++ b/src/libguac/raw_encoder.c @@ -19,15 +19,13 @@ #include "config.h" -#include "audio.h" +#include "guacamole/audio.h" +#include "guacamole/client.h" +#include "guacamole/protocol.h" +#include "guacamole/socket.h" +#include "guacamole/user.h" #include "raw_encoder.h" -#include -#include -#include -#include -#include - #include #include #include diff --git a/src/libguac/raw_encoder.h b/src/libguac/raw_encoder.h index b4050406..c3af151c 100644 --- a/src/libguac/raw_encoder.h +++ b/src/libguac/raw_encoder.h @@ -23,7 +23,7 @@ #include "config.h" -#include "audio.h" +#include "guacamole/audio.h" /** * The number of bytes to send in each audio blob. diff --git a/src/libguac/socket-broadcast.c b/src/libguac/socket-broadcast.c index a3f17fd0..f551e817 100644 --- a/src/libguac/socket-broadcast.c +++ b/src/libguac/socket-broadcast.c @@ -19,10 +19,10 @@ #include "config.h" -#include "client.h" -#include "error.h" -#include "socket.h" -#include "user.h" +#include "guacamole/client.h" +#include "guacamole/error.h" +#include "guacamole/socket.h" +#include "guacamole/user.h" #include #include diff --git a/src/libguac/socket-fd.c b/src/libguac/socket-fd.c index 34898524..742cc35d 100644 --- a/src/libguac/socket-fd.c +++ b/src/libguac/socket-fd.c @@ -19,8 +19,8 @@ #include "config.h" -#include "error.h" -#include "socket.h" +#include "guacamole/error.h" +#include "guacamole/socket.h" #include "wait-fd.h" #include diff --git a/src/libguac/socket-nest.c b/src/libguac/socket-nest.c index 967c9d97..8bc9291e 100644 --- a/src/libguac/socket-nest.c +++ b/src/libguac/socket-nest.c @@ -19,9 +19,9 @@ #include "config.h" -#include "protocol.h" -#include "socket.h" -#include "unicode.h" +#include "guacamole/protocol.h" +#include "guacamole/socket.h" +#include "guacamole/unicode.h" #include #include diff --git a/src/libguac/socket-ssl.c b/src/libguac/socket-ssl.c index 1a631fe1..3daa128e 100644 --- a/src/libguac/socket-ssl.c +++ b/src/libguac/socket-ssl.c @@ -19,9 +19,9 @@ #include "config.h" -#include "error.h" -#include "socket-ssl.h" -#include "socket.h" +#include "guacamole/error.h" +#include "guacamole/socket-ssl.h" +#include "guacamole/socket.h" #include "wait-fd.h" #include diff --git a/src/libguac/socket-tee.c b/src/libguac/socket-tee.c index 3f0fd6bd..cee9108c 100644 --- a/src/libguac/socket-tee.c +++ b/src/libguac/socket-tee.c @@ -19,7 +19,7 @@ #include "config.h" -#include "socket.h" +#include "guacamole/socket.h" #include diff --git a/src/libguac/socket-wsa.c b/src/libguac/socket-wsa.c index 1b59176a..f5602e39 100644 --- a/src/libguac/socket-wsa.c +++ b/src/libguac/socket-wsa.c @@ -17,8 +17,8 @@ * under the License. */ -#include "error.h" -#include "socket.h" +#include "guacamole/error.h" +#include "guacamole/socket.h" #include #include diff --git a/src/libguac/socket.c b/src/libguac/socket.c index 6bc0036b..66442d0c 100644 --- a/src/libguac/socket.c +++ b/src/libguac/socket.c @@ -19,10 +19,10 @@ #include "config.h" -#include "error.h" -#include "protocol.h" -#include "socket.h" -#include "timestamp.h" +#include "guacamole/error.h" +#include "guacamole/protocol.h" +#include "guacamole/socket.h" +#include "guacamole/timestamp.h" #include #include diff --git a/src/libguac/timestamp.c b/src/libguac/timestamp.c index 0d2dc0a8..9020a6e1 100644 --- a/src/libguac/timestamp.c +++ b/src/libguac/timestamp.c @@ -19,7 +19,7 @@ #include "config.h" -#include "timestamp.h" +#include "guacamole/timestamp.h" #include diff --git a/src/libguac/unicode.c b/src/libguac/unicode.c index e7af943f..fdc0fffd 100644 --- a/src/libguac/unicode.c +++ b/src/libguac/unicode.c @@ -19,7 +19,7 @@ #include "config.h" -#include "unicode.h" +#include "guacamole/unicode.h" #include diff --git a/src/libguac/user-handlers.c b/src/libguac/user-handlers.c index b84dc721..6be20e2e 100644 --- a/src/libguac/user-handlers.c +++ b/src/libguac/user-handlers.c @@ -19,12 +19,12 @@ #include "config.h" -#include "client.h" -#include "object.h" -#include "protocol.h" -#include "stream.h" -#include "timestamp.h" -#include "user.h" +#include "guacamole/client.h" +#include "guacamole/object.h" +#include "guacamole/protocol.h" +#include "guacamole/stream.h" +#include "guacamole/timestamp.h" +#include "guacamole/user.h" #include "user-handlers.h" #include diff --git a/src/libguac/user-handlers.h b/src/libguac/user-handlers.h index eedeba15..5d7c6eae 100644 --- a/src/libguac/user-handlers.h +++ b/src/libguac/user-handlers.h @@ -31,8 +31,8 @@ #include "config.h" -#include "client.h" -#include "timestamp.h" +#include "guacamole/client.h" +#include "guacamole/timestamp.h" /** * Internal handler for Guacamole instructions. Instruction handlers will be diff --git a/src/libguac/user-handshake.c b/src/libguac/user-handshake.c index b6018888..13bea51f 100644 --- a/src/libguac/user-handshake.c +++ b/src/libguac/user-handshake.c @@ -19,12 +19,12 @@ #include "config.h" -#include "client.h" -#include "error.h" -#include "parser.h" -#include "protocol.h" -#include "socket.h" -#include "user.h" +#include "guacamole/client.h" +#include "guacamole/error.h" +#include "guacamole/parser.h" +#include "guacamole/protocol.h" +#include "guacamole/socket.h" +#include "guacamole/user.h" #include #include diff --git a/src/libguac/user.c b/src/libguac/user.c index 14ec75bf..16590060 100644 --- a/src/libguac/user.c +++ b/src/libguac/user.c @@ -19,18 +19,18 @@ #include "config.h" -#include "client.h" #include "encode-jpeg.h" #include "encode-png.h" #include "encode-webp.h" +#include "guacamole/client.h" +#include "guacamole/object.h" +#include "guacamole/pool.h" +#include "guacamole/protocol.h" +#include "guacamole/socket.h" +#include "guacamole/stream.h" +#include "guacamole/timestamp.h" +#include "guacamole/user.h" #include "id.h" -#include "object.h" -#include "pool.h" -#include "protocol.h" -#include "socket.h" -#include "stream.h" -#include "timestamp.h" -#include "user.h" #include "user-handlers.h" #include