diff --git a/src/libimcv/imc/imc_os_info.h b/src/libimcv/imc/imc_os_info.h
index a6db44314..6bb0e960c 100644
--- a/src/libimcv/imc/imc_os_info.h
+++ b/src/libimcv/imc/imc_os_info.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imc_os_info imc_os_info
- * @{ @ingroup libimcv
+ * @{ @ingroup libimcv_imc
  */
 
 #ifndef IMC_OS_INFO_H_
diff --git a/src/libimcv/imcv.h b/src/libimcv/imcv.h
index cfb1903d9..31536eca5 100644
--- a/src/libimcv/imcv.h
+++ b/src/libimcv/imcv.h
@@ -27,6 +27,12 @@
  * @defgroup libimcv_plugins plugins
  * @ingroup libimcv
  *
+ * @defgroup libimcv_seg seg
+ * @ingroup libimcv
+ *
+ * @defgroup libimcv_swid swid
+ * @ingroup libimcv
+ *
  * @addtogroup libimcv
  * @{
  */
diff --git a/src/libimcv/imv/imv_os_info.h b/src/libimcv/imv/imv_os_info.h
index b68a17ee7..7cd609a22 100644
--- a/src/libimcv/imv/imv_os_info.h
+++ b/src/libimcv/imv/imv_os_info.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imv_os_info imv_os_info
- * @{ @ingroup libimcv
+ * @{ @ingroup libimcv_imv
  */
 
 #ifndef IMV_OS_INFO_H_
diff --git a/src/libimcv/plugins/imv_attestation/attest_db.h b/src/libimcv/plugins/imv_attestation/attest_db.h
index 07e55cce7..ab3d046b3 100644
--- a/src/libimcv/plugins/imv_attestation/attest_db.h
+++ b/src/libimcv/plugins/imv_attestation/attest_db.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup attest_db_t attest_db
- * @{ @ingroup libpts
+ * @{ @ingroup libimcv
  */
 
 #ifndef ATTEST_DB_H_
diff --git a/src/libimcv/pts/pts.h b/src/libimcv/pts/pts.h
index fead588ae..be32a3464 100644
--- a/src/libimcv/pts/pts.h
+++ b/src/libimcv/pts/pts.h
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup pts pts
- * @{ @ingroup libpts
+ * @{ @ingroup libimcv
  */
 
 #ifndef PTS_H_
diff --git a/src/libimcv/seg/seg_contract.h b/src/libimcv/seg/seg_contract.h
index 2a2666f42..23676a9f4 100644
--- a/src/libimcv/seg/seg_contract.h
+++ b/src/libimcv/seg/seg_contract.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup seg_contract seg_contract
- * @{ @ingroup libimcv
+ * @{ @ingroup libimcv_seg
  */
 
 #ifndef SEG_CONTRACT_H_
@@ -106,7 +106,7 @@ struct seg_contract_t {
 	 * Get contract role
 	 *
 	 * @return				TRUE:  contracting party (issuer),
-	 *						FALSE: contracted party 
+	 *						FALSE: contracted party
 	 */
 	bool (*is_issuer)(seg_contract_t *this);
 
@@ -162,7 +162,7 @@ struct seg_contract_t {
 };
 
 /**
- * Create a PA-TNC attribute segmentation contract 
+ * Create a PA-TNC attribute segmentation contract
  *
  * @param msg_type			PA-TNC message type
  * @param max_attr_size		Maximum PA-TNC attribute size in octets
diff --git a/src/libimcv/seg/seg_contract_manager.h b/src/libimcv/seg/seg_contract_manager.h
index 2757eca9e..fa9d23c0f 100644
--- a/src/libimcv/seg/seg_contract_manager.h
+++ b/src/libimcv/seg/seg_contract_manager.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup seg_contract_manager seg_contract_manager
- * @{ @ingroup libimcv
+ * @{ @ingroup libimcv_seg
  */
 
 #ifndef SEG_CONTRACT_MANAGER_H_
diff --git a/src/libimcv/seg/seg_env.h b/src/libimcv/seg/seg_env.h
index dd057ae47..08d33d752 100644
--- a/src/libimcv/seg/seg_env.h
+++ b/src/libimcv/seg/seg_env.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup seg_env seg_env
- * @{ @ingroup libimcv
+ * @{ @ingroup libimcv_seg
  */
 
 #ifndef SEG_ENV_H_
diff --git a/src/libimcv/swid/swid_error.h b/src/libimcv/swid/swid_error.h
index 1da6148ff..b459ba686 100644
--- a/src/libimcv/swid/swid_error.h
+++ b/src/libimcv/swid/swid_error.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup swid_error swid_error
- * @{ @ingroup swid
+ * @{ @ingroup libimcv_swid
  */
 
 #ifndef SWID_ERROR_H_
diff --git a/src/libimcv/swid/swid_inventory.h b/src/libimcv/swid/swid_inventory.h
index 52f9c66a8..04029070e 100644
--- a/src/libimcv/swid/swid_inventory.h
+++ b/src/libimcv/swid/swid_inventory.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup swid_inventory swid_inventory
- * @{ @ingroup pts
+ * @{ @ingroup libimcv_swid
  */
 
 #ifndef SWID_INVENTORY_H_
diff --git a/src/libimcv/swid/swid_tag.h b/src/libimcv/swid/swid_tag.h
index 0e2eb499f..22c14b1aa 100644
--- a/src/libimcv/swid/swid_tag.h
+++ b/src/libimcv/swid/swid_tag.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup swid_tag swid_tag
- * @{ @ingroup swid
+ * @{ @ingroup libimcv_swid
  */
 
 #ifndef SWID_TAG_H_
diff --git a/src/libimcv/swid/swid_tag_id.h b/src/libimcv/swid/swid_tag_id.h
index 9761f2af3..a2be290ae 100644
--- a/src/libimcv/swid/swid_tag_id.h
+++ b/src/libimcv/swid/swid_tag_id.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup swid_tag_id swid_tag_id
- * @{ @ingroup swid
+ * @{ @ingroup libimcv_swid
  */
 
 #ifndef SWID_TAG_ID_H_
diff --git a/src/libimcv/tcg/tcg_attr.h b/src/libimcv/tcg/tcg_attr.h
index 24ec6e1ea..9523f8e18 100644
--- a/src/libimcv/tcg/tcg_attr.h
+++ b/src/libimcv/tcg/tcg_attr.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_attr tcg_attr
- * @{ @ingroup libpts
+ * @{ @ingroup libimcv
  */
 
 #ifndef TCG_ATTR_H_