diff --git a/include/libopencm3/efm32/common/acmp_common.h b/include/libopencm3/efm32/common/acmp_common.h
index 1377e663..e47a1ad7 100644
--- a/include/libopencm3/efm32/common/acmp_common.h
+++ b/include/libopencm3/efm32/common/acmp_common.h
@@ -1,3 +1,5 @@
+/** @addtogroup acmp_defines
+ */
 /*
  * This file is part of the libopencm3 project.
  *
@@ -17,8 +19,9 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENCM3_EFM32_ACMP_H
-#define LIBOPENCM3_EFM32_ACMP_H
+#pragma once
+
+/**@{*/
 
 #include <libopencm3/efm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
@@ -181,5 +184,4 @@
 #define ACMP1_IFC		ACMP_IFC(ACMP1)
 #define ACMP1_ROUTE		ACMP_ROUTE(ACMP1)
 
-#endif
-
+/**@}*/
\ No newline at end of file
diff --git a/include/libopencm3/efm32/ezr32wg/acmp.h b/include/libopencm3/efm32/ezr32wg/acmp.h
index c0c2b639..668eca59 100644
--- a/include/libopencm3/efm32/ezr32wg/acmp.h
+++ b/include/libopencm3/efm32/ezr32wg/acmp.h
@@ -1,3 +1,11 @@
+/** @defgroup acmp_defines ACMP Defines
+ *
+ * @brief <b>Defined Constants and Types for the Analog Comparator module</b>
+ *
+ * @ingroup EZR32WG_defines
+ *
+ * LGPL License Terms @ref lgpl_license
+ */
 /*
  * This file is part of the libopencm3 project.
  *
@@ -17,9 +25,6 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENCM3_EFM32_EZR32WG_ACMP_H
-#define LIBOPENCM3_EFM32_EZR32WG_ACMP_H
+#pragma once
 
 #include <libopencm3/efm32/common/acmp_common.h>
-
-#endif
diff --git a/include/libopencm3/efm32/lg/acmp.h b/include/libopencm3/efm32/lg/acmp.h
index 0df98c94..7b961299 100644
--- a/include/libopencm3/efm32/lg/acmp.h
+++ b/include/libopencm3/efm32/lg/acmp.h
@@ -1,3 +1,11 @@
+/** @defgroup acmp_defines ACMP Defines
+ *
+ * @brief <b>Defined Constants and Types for the Analog Comparator module</b>
+ *
+ * @ingroup EFM32LG_defines
+ *
+ * LGPL License Terms @ref lgpl_license
+ */
 /*
  * This file is part of the libopencm3 project.
  *
@@ -17,9 +25,6 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENCM3_EFM32_LG_ACMP_H
-#define LIBOPENCM3_EFM32_LG_ACMP_H
+#pragma once
 
 #include <libopencm3/efm32/common/acmp_common.h>
-
-#endif
diff --git a/include/libopencm3/efm32/wg/acmp.h b/include/libopencm3/efm32/wg/acmp.h
index 4a468c89..6a4c10b5 100644
--- a/include/libopencm3/efm32/wg/acmp.h
+++ b/include/libopencm3/efm32/wg/acmp.h
@@ -1,3 +1,11 @@
+/** @defgroup acmp_defines ACMP Defines
+ *
+ * @brief <b>Defined Constants and Types for the Analog Comparator module</b>
+ *
+ * @ingroup EFM32WG_defines
+ *
+ * LGPL License Terms @ref lgpl_license
+ */
 /*
  * This file is part of the libopencm3 project.
  *
@@ -17,9 +25,6 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBOPENCM3_EFM32_WG_ACMP_H
-#define LIBOPENCM3_EFM32_WG_ACMP_H
+#pragma once
 
 #include <libopencm3/efm32/common/acmp_common.h>
-
-#endif
diff --git a/lib/efm32/ezr32wg/Makefile b/lib/efm32/ezr32wg/Makefile
index 75bd7a3f..e7fd6bdc 100644
--- a/lib/efm32/ezr32wg/Makefile
+++ b/lib/efm32/ezr32wg/Makefile
@@ -37,6 +37,7 @@ TGT_CFLAGS      += $(DEBUG_FLAGS)
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
 
+OBJS += acmp_common.o
 OBJS += adc_common.o
 OBJS += cmu_common.o
 OBJS += dac_common.o
diff --git a/lib/efm32/lg/Makefile b/lib/efm32/lg/Makefile
index 7da85ca0..7c6eb1a1 100644
--- a/lib/efm32/lg/Makefile
+++ b/lib/efm32/lg/Makefile
@@ -37,6 +37,7 @@ TGT_CFLAGS	+= $(STANDARD_FLAGS)
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
 
+OBJS += acmp_common.o
 OBJS += adc_common.o
 OBJS += cmu_common.o
 OBJS += dac_common.o
diff --git a/lib/efm32/wg/Makefile b/lib/efm32/wg/Makefile
index e089defd..17c91eb9 100644
--- a/lib/efm32/wg/Makefile
+++ b/lib/efm32/wg/Makefile
@@ -37,6 +37,7 @@ TGT_CFLAGS      += $(DEBUG_FLAGS)
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
 
+OBJS += acmp_common.o
 OBJS += adc_common.o
 OBJS += cmu_common.o
 OBJS += dac_common.o