diff --git a/Makefile.am b/Makefile.am
index 3e6f1b61..862d00e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,4 +64,3 @@ endif
 
 EXTRA_DIST = LICENSE doc/Doxyfile
 
-
diff --git a/src/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am
index f5361374..f0c68d0f 100644
--- a/src/protocols/vnc/Makefile.am
+++ b/src/protocols/vnc/Makefile.am
@@ -41,8 +41,23 @@ AM_CFLAGS = -Werror -Wall -pedantic -Iinclude @LIBGUAC_INCLUDE@
 
 lib_LTLIBRARIES = libguac-client-vnc.la
 
-libguac_client_vnc_la_SOURCES = client.c vnc_handlers.c guac_handlers.c convert.c
-noinst_HEADERS = client.h vnc_handlers.h guac_handlers.h convert.h
+libguac_client_vnc_la_SOURCES = \
+    src/client.c                \
+    src/vnc_handlers.c          \
+    src/guac_handlers.c         \
+    src/pa_handlers.c           \
+    src/queue.c                 \
+    src/buffer.c                \
+    src/convert.c
+    
+noinst_HEADERS =            \
+    include/client.h        \
+    include/vnc_handlers.h  \
+    include/guac_handlers.h \
+    include/pa_handlers.h   \
+    include/queue.h         \
+    include/buffer.h        \
+    include/convert.h
 
 libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0 @VNC_LIBS@ @CAIRO_LIBS@
 libguac_client_vnc_la_LIBADD  = @LIBGUAC_LTLIB@