diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 17f2cc0fd..f232fb65b 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -85,6 +85,14 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- Guacamole Authentication API -->
+        <dependency>
+            <groupId>net.sourceforge.guacamole</groupId>
+            <artifactId>guacamole-common-auth</artifactId>
+            <version>0.5.0</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- Guacamole JavaScript API -->
         <dependency>
             <groupId>net.sourceforge.guacamole</groupId>
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java
deleted file mode 100644
index aeeb35045..000000000
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/AuthenticationProvider.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-package net.sourceforge.guacamole.net.auth;
-
-import net.sourceforge.guacamole.GuacamoleException;
-
-public interface AuthenticationProvider<CredentialType> {
-
-    public UserConfiguration getUserConfiguration(CredentialType credentials) throws GuacamoleException;
-
-}
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/UserConfiguration.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/UserConfiguration.java
deleted file mode 100644
index 705cf524e..000000000
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/UserConfiguration.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-package net.sourceforge.guacamole.net.auth;
-
-import java.util.Collection;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
-
-public interface UserConfiguration {
-
-    public GuacamoleConfiguration getConfiguration(String id);
-
-    public Collection<String> listConfigurations();
-    
-}
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/UsernamePassword.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/UsernamePassword.java
deleted file mode 100644
index 0322bb20c..000000000
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/auth/UsernamePassword.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package net.sourceforge.guacamole.net.auth;
-
-public class UsernamePassword {
-
-    private String username;
-    private String password;
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-}