diff --git a/src/common-ssh/Makefile.am b/src/common-ssh/Makefile.am
index a53f2cf6..c05f2640 100644
--- a/src/common-ssh/Makefile.am
+++ b/src/common-ssh/Makefile.am
@@ -23,18 +23,18 @@ ACLOCAL_AMFLAGS = -I m4
 noinst_LTLIBRARIES = libguac_common_ssh.la
 
 libguac_common_ssh_la_SOURCES = \
-    guac_sftp.c                 \
-    guac_ssh.c                  \
-    guac_ssh_buffer.c           \
-    guac_ssh_key.c              \
-    guac_ssh_user.c
+    buffer.c                    \
+    sftp.c                      \
+    ssh.c                       \
+    key.c                       \
+    user.c
 
-noinst_HEADERS =      \
-    guac_sftp.h       \
-    guac_ssh.h        \
-    guac_ssh_buffer.h \
-    guac_ssh_key.h    \
-    guac_ssh_user.h
+noinst_HEADERS =        \
+    common-ssh/buffer.h \
+    common-ssh/key.h    \
+    common-ssh/sftp.h   \
+    common-ssh/ssh.h    \
+    common-ssh/user.h
 
 libguac_common_ssh_la_CFLAGS = \
     -Werror -Wall -pedantic    \
diff --git a/src/common-ssh/guac_ssh_buffer.c b/src/common-ssh/buffer.c
similarity index 100%
rename from src/common-ssh/guac_ssh_buffer.c
rename to src/common-ssh/buffer.c
diff --git a/src/common-ssh/guac_ssh_buffer.h b/src/common-ssh/common-ssh/buffer.h
similarity index 100%
rename from src/common-ssh/guac_ssh_buffer.h
rename to src/common-ssh/common-ssh/buffer.h
diff --git a/src/common-ssh/guac_ssh_key.h b/src/common-ssh/common-ssh/key.h
similarity index 100%
rename from src/common-ssh/guac_ssh_key.h
rename to src/common-ssh/common-ssh/key.h
diff --git a/src/common-ssh/guac_sftp.h b/src/common-ssh/common-ssh/sftp.h
similarity index 99%
rename from src/common-ssh/guac_sftp.h
rename to src/common-ssh/common-ssh/sftp.h
index fdc1e72e..038a5773 100644
--- a/src/common-ssh/guac_sftp.h
+++ b/src/common-ssh/common-ssh/sftp.h
@@ -21,7 +21,7 @@
 #define GUAC_COMMON_SSH_SFTP_H
 
 #include "common/json.h"
-#include "guac_ssh.h"
+#include "ssh.h"
 
 #include <guacamole/object.h>
 #include <guacamole/user.h>
diff --git a/src/common-ssh/guac_ssh.h b/src/common-ssh/common-ssh/ssh.h
similarity index 99%
rename from src/common-ssh/guac_ssh.h
rename to src/common-ssh/common-ssh/ssh.h
index 36ad1762..d96ce44c 100644
--- a/src/common-ssh/guac_ssh.h
+++ b/src/common-ssh/common-ssh/ssh.h
@@ -20,7 +20,7 @@
 #ifndef GUAC_COMMON_SSH_H
 #define GUAC_COMMON_SSH_H
 
-#include "guac_ssh_user.h"
+#include "user.h"
 
 #include <guacamole/client.h>
 #include <libssh2.h>
diff --git a/src/common-ssh/guac_ssh_user.h b/src/common-ssh/common-ssh/user.h
similarity index 99%
rename from src/common-ssh/guac_ssh_user.h
rename to src/common-ssh/common-ssh/user.h
index eeaa4606..745728f1 100644
--- a/src/common-ssh/guac_ssh_user.h
+++ b/src/common-ssh/common-ssh/user.h
@@ -20,7 +20,7 @@
 #ifndef GUAC_COMMON_SSH_USER_H
 #define GUAC_COMMON_SSH_USER_H
 
-#include "guac_ssh_key.h"
+#include "key.h"
 
 /**
  * Data describing an SSH user, including their credentials.
diff --git a/src/common-ssh/guac_ssh_key.c b/src/common-ssh/key.c
similarity index 99%
rename from src/common-ssh/guac_ssh_key.c
rename to src/common-ssh/key.c
index 7594b842..82a32522 100644
--- a/src/common-ssh/guac_ssh_key.c
+++ b/src/common-ssh/key.c
@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include "guac_ssh_buffer.h"
-#include "guac_ssh_key.h"
+#include "common-ssh/buffer.h"
+#include "common-ssh/key.h"
 
 #include <openssl/bio.h>
 #include <openssl/bn.h>
diff --git a/src/common-ssh/guac_sftp.c b/src/common-ssh/sftp.c
similarity index 99%
rename from src/common-ssh/guac_sftp.c
rename to src/common-ssh/sftp.c
index e7314d2a..79db35e7 100644
--- a/src/common-ssh/guac_sftp.c
+++ b/src/common-ssh/sftp.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "guac_sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
 
 #include <guacamole/client.h>
 #include <guacamole/object.h>
diff --git a/src/common-ssh/guac_ssh.c b/src/common-ssh/ssh.c
similarity index 99%
rename from src/common-ssh/guac_ssh.c
rename to src/common-ssh/ssh.c
index 488eea24..9d3de19f 100644
--- a/src/common-ssh/guac_ssh.c
+++ b/src/common-ssh/ssh.c
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include "guac_ssh.h"
-#include "guac_ssh_key.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/key.h"
+#include "common-ssh/ssh.h"
+#include "common-ssh/user.h"
 
 #include <guacamole/client.h>
 #include <libssh2.h>
diff --git a/src/common-ssh/guac_ssh_user.c b/src/common-ssh/user.c
similarity index 97%
rename from src/common-ssh/guac_ssh_user.c
rename to src/common-ssh/user.c
index 73319c0e..92c8d963 100644
--- a/src/common-ssh/guac_ssh_user.c
+++ b/src/common-ssh/user.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "guac_ssh_key.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/key.h"
+#include "common-ssh/user.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c
index 2dcb401b..d12efbaa 100644
--- a/src/protocols/rdp/client.c
+++ b/src/protocols/rdp/client.c
@@ -27,9 +27,9 @@
 #include "user.h"
 
 #ifdef ENABLE_COMMON_SSH
-#include <guac_sftp.h>
-#include <guac_ssh.h>
-#include <guac_ssh_user.h>
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
+#include "common-ssh/user.h"
 #endif
 
 #include <freerdp/cache/cache.h>
diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c
index a48230a0..8d49c83f 100644
--- a/src/protocols/rdp/rdp.c
+++ b/src/protocols/rdp/rdp.c
@@ -40,9 +40,9 @@
 #include "rdp_svc.h"
 
 #ifdef ENABLE_COMMON_SSH
-#include <guac_sftp.h>
-#include <guac_ssh.h>
-#include <guac_ssh_user.h>
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
+#include "common-ssh/user.h"
 #endif
 
 #include <freerdp/cache/bitmap.h>
diff --git a/src/protocols/rdp/rdp.h b/src/protocols/rdp/rdp.h
index e3e33119..943155dd 100644
--- a/src/protocols/rdp/rdp.h
+++ b/src/protocols/rdp/rdp.h
@@ -39,9 +39,9 @@
 #include <guacamole/client.h>
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
-#include "guac_ssh.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
+#include "common-ssh/user.h"
 #endif
 
 #include <pthread.h>
diff --git a/src/protocols/rdp/sftp.c b/src/protocols/rdp/sftp.c
index efda47d6..ecfe35fe 100644
--- a/src/protocols/rdp/sftp.c
+++ b/src/protocols/rdp/sftp.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "rdp.h"
 #include "sftp.h"
 
diff --git a/src/protocols/ssh/client.c b/src/protocols/ssh/client.c
index 13dd1c89..2110ba98 100644
--- a/src/protocols/ssh/client.c
+++ b/src/protocols/ssh/client.c
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "ssh.h"
 #include "terminal.h"
 #include "user.h"
diff --git a/src/protocols/ssh/sftp.c b/src/protocols/ssh/sftp.c
index 9fddc30e..f4173a68 100644
--- a/src/protocols/ssh/sftp.c
+++ b/src/protocols/ssh/sftp.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "sftp.h"
 #include "ssh.h"
 
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index 53835c85..dd0a30f7 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "common/recording.h"
-#include "guac_sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
 #include "settings.h"
 #include "sftp.h"
 #include "ssh.h"
diff --git a/src/protocols/ssh/ssh.h b/src/protocols/ssh/ssh.h
index 44027ee8..d6dbdaf4 100644
--- a/src/protocols/ssh/ssh.h
+++ b/src/protocols/ssh/ssh.h
@@ -22,9 +22,9 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
-#include "guac_ssh.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
+#include "common-ssh/user.h"
 #include "settings.h"
 #include "terminal.h"
 
diff --git a/src/protocols/vnc/client.c b/src/protocols/vnc/client.c
index 516d93fe..00b90154 100644
--- a/src/protocols/vnc/client.c
+++ b/src/protocols/vnc/client.c
@@ -24,9 +24,9 @@
 #include "vnc.h"
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
-#include "guac_ssh.h"
-#include "sftp.h"
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
+#include "common-ssh/user.h"
 #endif
 
 #ifdef ENABLE_PULSE
diff --git a/src/protocols/vnc/sftp.c b/src/protocols/vnc/sftp.c
index fc90668c..e5e768ac 100644
--- a/src/protocols/vnc/sftp.c
+++ b/src/protocols/vnc/sftp.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "sftp.h"
 #include "vnc.h"
 
diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c
index 9b0bd769..710372f9 100644
--- a/src/protocols/vnc/vnc.c
+++ b/src/protocols/vnc/vnc.c
@@ -37,8 +37,8 @@
 #endif
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
 #include "sftp.h"
 #endif
 
diff --git a/src/protocols/vnc/vnc.h b/src/protocols/vnc/vnc.h
index 7ae8b720..0edbcd47 100644
--- a/src/protocols/vnc/vnc.h
+++ b/src/protocols/vnc/vnc.h
@@ -37,9 +37,9 @@
 #endif
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
-#include "guac_ssh.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/sftp.h"
+#include "common-ssh/ssh.h"
+#include "common-ssh/user.h"
 #endif
 
 #include <pthread.h>