diff --git a/wolfHSM/Makefile b/wolfHSM/Makefile
index 7bd5db91..87655d8b 100644
--- a/wolfHSM/Makefile
+++ b/wolfHSM/Makefile
@@ -100,6 +100,12 @@ pdf-setup: wolfhsm-update builddir
 .PHONY: html-prep
 html-prep: api
 	$(Q)cp -a api/md/*8h* build/html/
+	$(Q)cp -a api/md/Classes build/html/
+	$(Q)perl -i -pe 's#\]\(/Classes/#](#g' build/html/Classes/*.md
+	$(Q)perl -i -pe "s/Classes\///g" build/html/Classes/*.md
+	$(Q)perl -i -pe 's#\]\(/#](../#g' build/html/Classes/*.md
+	$(Q)perl -i -pe 's#\]\(/#](#g' build/html/*8h*
+	$(Q)perl -i -pe "s/(\]\([^)#]*#[a-z]+-)([^)]+?)(\))/\$$1.(\$$2=~tr#-#_#r).\$$3/ge" build/html/*8h* build/html/Classes/*.md
 
 	$(Q)perl -i -pe "s/\/group_/group_/g" build/html/group* build/html/*8h*
 	$(Q)perl -i -pe "s/dox_comments\/header_files\///" build/html/*8h*
diff --git a/wolfHSM/doxybook.cfg b/wolfHSM/doxybook.cfg
index 5e57fe3a..3bf94f81 100644
--- a/wolfHSM/doxybook.cfg
+++ b/wolfHSM/doxybook.cfg
@@ -12,6 +12,7 @@
   "folderGroupsName": "",
   "folderFilesName": "",
   "foldersToGenerate": [
+    "classes",
     "modules",
     "files"
   ]
diff --git a/wolfMQTT/Makefile b/wolfMQTT/Makefile
index c9830004..419a0055 100644
--- a/wolfMQTT/Makefile
+++ b/wolfMQTT/Makefile
@@ -40,14 +40,15 @@ api: wolfmqtt-update
 .PHONY: html-prep
 html-prep: api
 	$(Q)cp -a api/md/*8h* build/html/
+	$(Q)cp -a api/md/Classes build/html/
 	$(Q)rm -rf build/html/chapter05.md
-	$(Q)perl -i -pe "s/Classes\///g" build/html/*8h*
-	$(Q)perl -i -pe "s/(?<=md\#function\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge"   build/html/*8h*
-	$(Q)perl -i -pe "s/(?<=md\#typedef\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge"   build/html/*8h*
-	$(Q)perl -i -pe "s/(?<=md\#enum\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge"   build/html/*8h*
-	$(Q)perl -i -pe "s/\\\\discussion//g" build/html/*8h*
-	$(Q)perl -i -pe "s/\/mqtt_/mqtt_/g" build/html/*8h*
-	$(Q)perl -i -pe "s/dox_comments\/header_files\///" build/html/*8h*
+	$(Q)perl -i -pe "s/\\\\discussion//g" build/html/*8h* build/html/Classes/*.md
+	$(Q)perl -i -pe "s/dox_comments\/header_files\///" build/html/*8h* build/html/Classes/*.md
+	$(Q)perl -i -pe 's#\]\(/#](#g' build/html/*8h*
+	$(Q)perl -i -pe 's#\]\(/Classes/#](#g' build/html/Classes/*.md
+	$(Q)perl -i -pe "s/Classes\///g" build/html/Classes/*.md
+	$(Q)perl -i -pe 's#\]\(/#](../#g' build/html/Classes/*.md
+	$(Q)perl -i -pe "s/(\]\([^)#]*#[a-z]+-)([^)]+?)(\))/\$$1.(\$$2=~tr#-#_#r).\$$3/ge" build/html/*8h* build/html/Classes/*.md
 
 # Set input format to gfm to fix issues with converted API docs
 # Regexes:
diff --git a/wolfMQTT/doxybook.cfg b/wolfMQTT/doxybook.cfg
index 5e57fe3a..3bf94f81 100644
--- a/wolfMQTT/doxybook.cfg
+++ b/wolfMQTT/doxybook.cfg
@@ -12,6 +12,7 @@
   "folderGroupsName": "",
   "folderFilesName": "",
   "foldersToGenerate": [
+    "classes",
     "modules",
     "files"
   ]
diff --git a/wolfSSL/Makefile b/wolfSSL/Makefile
index c6fe1245..6bcef5be 100644
--- a/wolfSSL/Makefile
+++ b/wolfSSL/Makefile
@@ -67,6 +67,7 @@ html-prep: api
 	$(Q)rm -f build/html/appendix01.md build/html/appendix02.md build/html/appendix03.md
 	$(Q)perl -i -pe "s/(?<=md\#function\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" build/html/group* build/html/*8h*
 	$(Q)perl -i -pe "s/\/group_/group_/g" build/html/group* build/html/*8h*
+	$(Q)perl -i -pe 's#\]\(/#](#g' build/html/group* build/html/*8h*
 	$(Q)perl -i -pe "s/dox_comments\/$(HEADER_FILES)\///" build/html/*8h*
 
 # Set input format to gfm to fix issues with converted API docs
diff --git a/wolfTPM/Makefile b/wolfTPM/Makefile
index fb949b7c..75038cd5 100644
--- a/wolfTPM/Makefile
+++ b/wolfTPM/Makefile
@@ -48,6 +48,12 @@ html-prep: api
   else
 	$(Q)cp -a api/md/group* build/html/
 	$(Q)cp -a api/md/*8h* build/html/
+	$(Q)cp -a api/md/Classes build/html/
+	$(Q)perl -i -pe 's#\]\(/Classes/#](#g' build/html/Classes/*.md
+	$(Q)perl -i -pe "s/Classes\///g" build/html/Classes/*.md
+	$(Q)perl -i -pe 's#\]\(/#](../#g' build/html/Classes/*.md
+	$(Q)perl -i -pe 's#\]\(/#](#g' build/html/group* build/html/*8h*
+	$(Q)perl -i -pe "s/(\]\([^)#]*#[a-z]+-)([^)]+?)(\))/\$$1.(\$$2=~tr#-#_#r).\$$3/ge" build/html/group* build/html/*8h* build/html/Classes/*.md
   endif
 
 	$(Q)rm -rf build/html/chapter05.md
diff --git a/wolfTPM/doxybook.cfg b/wolfTPM/doxybook.cfg
index 5e57fe3a..3bf94f81 100644
--- a/wolfTPM/doxybook.cfg
+++ b/wolfTPM/doxybook.cfg
@@ -12,6 +12,7 @@
   "folderGroupsName": "",
   "folderFilesName": "",
   "foldersToGenerate": [
+    "classes",
     "modules",
     "files"
   ]