diff --git a/.classpath b/.classpath
index fa9b1e856..25220b636 100644
--- a/.classpath
+++ b/.classpath
@@ -15,10 +15,6 @@
 	<classpathentry kind="src" path="src/main/protocol-impl/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="lib" path="lib/protobuf-java-3.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/jboss-common-jdbc-wrapper.jar"/>
-	<classpathentry kind="lib" path="lib/c3p0-0.9.1-pre6.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-api-1.6.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/MySQL ConnectorJ Extra Libraries"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/CHANGES b/CHANGES
index 03750e10b..edad71009 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 8.0.16
 
+  - WL#12825, Remove third-party libraries from sources and bundles.
+
   - Fix for Bug#93590 (29054329), javax.net.ssl.SSLException: closing inbound before receiving peer's close_notify.
 
   - Fix for Bug#94414 (29384853), Connector/J RPM package have version number in path.
diff --git a/README b/README
index dfd8bb623..44b87d5e4 100644
--- a/README
+++ b/README
@@ -1,6 +1,7 @@
 Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 
-This is a release of MySQL Connector/J, a JDBC Type 4 driver for MySQL.
+This is a release of MySQL Connector/J, a JDBC Type 4 driver for MySQL that
+also supports the new X DevAPI.
 
 License information can be found in the LICENSE file.
 
@@ -15,3 +16,13 @@ For additional downloads and the source of MySQL Connector/J, visit
   http://dev.mysql.com/downloads
 
 MySQL Connector/J is brought to you by the MySQL team at Oracle.
+
+Notice:
+- In order to use the logging capabilities provided by the default
+  implementation com.mysql.cj.log.Slf4JLogger, it is required to add one or
+  more jars for Simple Logging Facade for Java (SLF4J) to your CLASSPATH.
+- To use the X DevAPI features in Connector/J, you also need the external
+  library protobuf-java, which you can download manually from the official
+  Maven repository and add it to the CLASSPATH, or use Maven's automatic
+  dependency resolution features by adding a dependency to "GroupId: mysql"
+  and "ArtifactId: mysql-connector-java" to your project's pom.xml file.
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 934c3b33a..7572a4ce2 100644
--- a/build.xml
+++ b/build.xml
@@ -280,10 +280,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
             <exclude name="**/protobuf-java-2.6.0.jar" />
         </fileset>
 
-        <fileset dir="${com.mysql.cj.build.dir.driver}/lib">
-            <include name="**/*.jar" />
-        </fileset>
-
         <pathelement location="${com.mysql.cj.build.dir.driver}" />
     </path>
 
@@ -594,10 +590,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
             <filterset refid="versionFilterset" />
             <filterset refid="licenseFilterset" />
         </copy>
-
-        <copy todir="${com.mysql.cj.build.dir.driver}/lib">
-            <fileset dir="lib" />
-        </copy>
     </target>
 
 
@@ -1307,9 +1299,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
                         <include name="**/*.jar" />
                         <exclude name="**/protobuf-java-2.6.0.jar" />
                     </fileset>
-                    <fileset dir="${com.mysql.cj.build.dir.driver}/lib">
-                        <include name="**/*.jar" />
-                    </fileset>
                     <pathelement location="${com.mysql.cj.build.dir.driver}" />
                     <pathelement location="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}" />
                     <pathelement path="${com.mysql.cj.testsuite.build.classpath}" />
diff --git a/lib/c3p0-0.9.1-pre6.jar b/lib/c3p0-0.9.1-pre6.jar
deleted file mode 100644
index 3caa24b49..000000000
Binary files a/lib/c3p0-0.9.1-pre6.jar and /dev/null differ
diff --git a/lib/c3p0-0.9.1-pre6.src.zip b/lib/c3p0-0.9.1-pre6.src.zip
deleted file mode 100644
index a4faedfe7..000000000
Binary files a/lib/c3p0-0.9.1-pre6.src.zip and /dev/null differ
diff --git a/lib/jboss-common-jdbc-wrapper-src.jar b/lib/jboss-common-jdbc-wrapper-src.jar
deleted file mode 100644
index 192cb6ad1..000000000
Binary files a/lib/jboss-common-jdbc-wrapper-src.jar and /dev/null differ
diff --git a/lib/jboss-common-jdbc-wrapper.jar b/lib/jboss-common-jdbc-wrapper.jar
deleted file mode 100644
index db01063e9..000000000
Binary files a/lib/jboss-common-jdbc-wrapper.jar and /dev/null differ
diff --git a/lib/protobuf-java-3.6.1.jar b/lib/protobuf-java-3.6.1.jar
deleted file mode 100644
index 8a187891f..000000000
Binary files a/lib/protobuf-java-3.6.1.jar and /dev/null differ
diff --git a/lib/slf4j-api-1.6.1.jar b/lib/slf4j-api-1.6.1.jar
deleted file mode 100644
index 42e0ad0de..000000000
Binary files a/lib/slf4j-api-1.6.1.jar and /dev/null differ
diff --git a/src/main/core-impl/java/com/mysql/cj/log/Jdk14Logger.java b/src/main/core-api/java/com/mysql/cj/log/Jdk14Logger.java
similarity index 99%
rename from src/main/core-impl/java/com/mysql/cj/log/Jdk14Logger.java
rename to src/main/core-api/java/com/mysql/cj/log/Jdk14Logger.java
index f13550b68..14769ee87 100644
--- a/src/main/core-impl/java/com/mysql/cj/log/Jdk14Logger.java
+++ b/src/main/core-api/java/com/mysql/cj/log/Jdk14Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
diff --git a/src/main/core-impl/java/com/mysql/cj/log/NullLogger.java b/src/main/core-api/java/com/mysql/cj/log/NullLogger.java
similarity index 97%
rename from src/main/core-impl/java/com/mysql/cj/log/NullLogger.java
rename to src/main/core-api/java/com/mysql/cj/log/NullLogger.java
index 7428ed23c..c80108a64 100644
--- a/src/main/core-impl/java/com/mysql/cj/log/NullLogger.java
+++ b/src/main/core-api/java/com/mysql/cj/log/NullLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
diff --git a/src/main/core-impl/java/com/mysql/cj/log/Slf4JLogger.java b/src/main/core-api/java/com/mysql/cj/log/Slf4JLogger.java
similarity index 98%
rename from src/main/core-impl/java/com/mysql/cj/log/Slf4JLogger.java
rename to src/main/core-api/java/com/mysql/cj/log/Slf4JLogger.java
index 189f102a3..d00270252 100644
--- a/src/main/core-impl/java/com/mysql/cj/log/Slf4JLogger.java
+++ b/src/main/core-api/java/com/mysql/cj/log/Slf4JLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the