8 files changed, 3 insertions, 21 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f1dff72b..237555b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,9 +72,7 @@ install(DIRECTORY ../include/nng
         COMPONENT Headers)
 
 # These are promoted for testing
-set(NNG_SUPP_BASE64 ${NNG_SUPP_BASE64} PARENT_SCOPE)
 set(NNG_SUPP_HTTP ${NNG_SUPP_HTTP} PARENT_SCOPE)
-set(NNG_SUPP_SHA1 ${NNG_SUPP_SHA1} PARENT_SCOPE)
 set(NNG_SUPP_WEBSOCKET ${NNG_SUPP_WEBSOCKET} PARENT_SCOPE)
 
 # Configure files
diff --git a/src/supplemental/CMakeLists.txt b/src/supplemental/CMakeLists.txt
index 9bbddc44..9a54beea 100644
--- a/src/supplemental/CMakeLists.txt
+++ b/src/supplemental/CMakeLists.txt
@@ -9,7 +9,6 @@
 
 nng_directory(supplemental)
 
-add_subdirectory(base64)
 add_subdirectory(http)
 add_subdirectory(tls)
 add_subdirectory(util)
diff --git a/src/supplemental/base64/CMakeLists.txt b/src/supplemental/base64/CMakeLists.txt
deleted file mode 100644
index 653ea711..00000000
--- a/src/supplemental/base64/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
-#
-# This software is supplied under the terms of the MIT License, a
-# copy of which should be located in the distribution where this
-# file was obtained (LICENSE.txt).  A copy of the license may also be
-# found online at https://opensource.org/licenses/MIT.
-#
-
-nng_sources_if(NNG_SUPP_BASE64
-        base64.c
-        base64.h)
-
-nng_test_if(NNG_SUPP_BASE64
-        base64_test)
diff --git a/src/supplemental/websocket/CMakeLists.txt b/src/supplemental/websocket/CMakeLists.txt
index 5d2f4b0c..37273c27 100644
--- a/src/supplemental/websocket/CMakeLists.txt
+++ b/src/supplemental/websocket/CMakeLists.txt
@@ -9,8 +9,9 @@
 #
 
 if (NNG_SUPP_WEBSOCKET)
-    nng_sources(sha1.c sha1.h websocket.c websocket.h)
+    nng_sources(base64.c base64.h sha1.c sha1.h websocket.c websocket.h)
     nng_test(sha1_test)
+    nng_test(base64_test)
 else ()
     nng_sources(stub.c)
 endif ()
diff --git a/src/supplemental/base64/base64.c b/src/supplemental/websocket/base64.c
index 3c19ad8a..3c19ad8a 100644
--- a/src/supplemental/base64/base64.c
+++ b/src/supplemental/websocket/base64.c
diff --git a/src/supplemental/base64/base64.h b/src/supplemental/websocket/base64.h
index 97ca8968..97ca8968 100644
--- a/src/supplemental/base64/base64.h
+++ b/src/supplemental/websocket/base64.h
diff --git a/src/supplemental/base64/base64_test.c b/src/supplemental/websocket/base64_test.c
index ae8df8e6..ae8df8e6 100644
--- a/src/supplemental/base64/base64_test.c
+++ b/src/supplemental/websocket/base64_test.c
diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c
index 9cb1a677..84d3fd72 100644
--- a/src/supplemental/websocket/websocket.c
+++ b/src/supplemental/websocket/websocket.c
@@ -16,8 +16,7 @@
 #include "core/nng_impl.h"
 #include "supplemental/http/http_api.h"
 
-#include "supplemental/base64/base64.h"
-
+#include "base64.h"
 #include "sha1.h"
 #include "websocket.h"