7 files changed, 6 insertions, 15 deletions
diff --git a/src/gadc/gadc_gadc.c b/src/gadc/gadc.c
index 5ac8e53c..ec0bc880 100644
--- a/src/gadc/gadc_gadc.c
+++ b/src/gadc/gadc.c
@@ -5,19 +5,12 @@
  *              http://ugfx.org/license.html
  */
 
-/**
- * @file    src/gadc/gadc_gadc.c
- * @brief   GADC sub-system code.
- *
- * @addtogroup GADC
- * @{
- */
 #include "gfx.h"
 
 #if GFX_USE_GADC
 
 /* Include the driver defines */
-#include "driver.h"
+#include "gadc_driver.h"
 
 #if GADC_MAX_HIGH_SPEED_SAMPLERATE > GADC_MAX_SAMPLE_FREQUENCY/2
 	#error "GADC: GADC_MAX_HIGH_SPEED_SAMPLERATE has been set too high. It must be less than half the maximum CPU rate"
@@ -358,5 +351,3 @@ bool_t gadcLowSpeedStart(uint32_t physdev, adcsample_t *buffer, GADCCallbackFunc
 }
 
 #endif /* GFX_USE_GADC */
-/** @} */
-
diff --git a/src/gadc/sys_defs.h b/src/gadc/gadc.h
index 1f40f6df..461e490e 100644
--- a/src/gadc/sys_defs.h
+++ b/src/gadc/gadc.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gadc/sys_defs.h
+ * @file    src/gadc/gadc.h
  *
  * @addtogroup GADC
  *
diff --git a/src/gadc/gadc.mk b/src/gadc/gadc.mk
new file mode 100644
index 00000000..05b1e9cc
--- /dev/null
+++ b/src/gadc/gadc.mk
@@ -0,0 +1 @@
+GFXSRC +=   $(GFXLIB)/src/gadc/gadc.c
diff --git a/src/gadc/driver.h b/src/gadc/gadc_driver.h
index 77604b9f..7c72dfd4 100644
--- a/src/gadc/driver.h
+++ b/src/gadc/gadc_driver.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gadc/driver.h
+ * @file    src/gadc/gadc_driver.h
  * @brief   GADC - Periodic ADC driver header file.
  *
  * @defgroup Driver Driver
diff --git a/src/gadc/sys_options.h b/src/gadc/gadc_options.h
index d9519c39..18c5038c 100644
--- a/src/gadc/sys_options.h
+++ b/src/gadc/gadc_options.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gadc/sys_options.h
+ * @file    src/gadc/gadc_options.h
  * @brief   GADC - Periodic ADC subsystem options header file.
  *
  * @addtogroup GADC
diff --git a/src/gadc/sys_rules.h b/src/gadc/gadc_rules.h
index 363b2434..d6c6e5ee 100644
--- a/src/gadc/sys_rules.h
+++ b/src/gadc/gadc_rules.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gadc/sys_rules.h
+ * @file    src/gadc/gadc_rules.h
  * @brief   GADC safety rules header file.
  *
  * @addtogroup GADC
diff --git a/src/gadc/sys_make.mk b/src/gadc/sys_make.mk
deleted file mode 100644
index 21a07dbe..00000000
--- a/src/gadc/sys_make.mk
+++ /dev/null
@@ -1 +0,0 @@
-GFXSRC +=   $(GFXLIB)/src/gadc/gadc_gadc.c