diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
index cca02d7e..5d5f5a5a 100644
--- a/include/gwin/gwin.h
+++ b/include/gwin/gwin.h
@@ -21,9 +21,12 @@
  * @file    include/gwin/gwin.h
  * @brief   GWIN Graphic window subsystem header file.
  *
- * @addtogroup GWIN
+ * @defgroup Window
+ * @ingroup GWIN
+ *
  * @{
  */
+
 #ifndef _GWIN_H
 #define _GWIN_H
 
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c
index 999ea304..720f355c 100644
--- a/src/gwin/gwin.c
+++ b/src/gwin/gwin.c
@@ -17,14 +17,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 /**
  * @file    src/gwin/gwin.c
  * @brief   GWIN sub-system code.
  *
- * @addtogroup GWIN
+ * @defgroup Window
+ * @ingroup GWIN
+ *
  * @{
  */
+
 #include "ch.h"
 #include "hal.h"
 #include "gfx.h"