diff --git a/include/gwin/gwidget.h b/include/gwin/gwidget.h
index b760dd41..493485b3 100644
--- a/include/gwin/gwidget.h
+++ b/include/gwin/gwidget.h
@@ -279,15 +279,26 @@ bool_t gwinAttachListener(GListener *pl);
 #if GWIN_NEED_BUTTON || defined(__DOXYGEN__)
 	#include "gwin/button.h"
 #endif
+
 #if GWIN_NEED_SLIDER || defined(__DOXYGEN__)
 	#include "gwin/slider.h"
 #endif
+
 #if GWIN_NEED_CHECKBOX || defined(__DOXYGEN__)
 	#include "gwin/checkbox.h"
 #endif
+
 #if GWIN_NEED_RADIO || defined(__DOXYGEN__)
 	#include "gwin/radio.h"
 #endif
 
+#if GWIN_NEED_LABEL || defined(__DOXYGEN__)
+	#include "gwin/label.h"
+#endif
+
+#if GWIN_NEED_LIST || defined(__DOXYGEN__)
+	#include "gwin/list.h"
+#endif
+
 #endif /* _GWIDGET_H */
 /** @} */
diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
index 37a14fa1..fa5ba613 100644
--- a/include/gwin/gwin.h
+++ b/include/gwin/gwin.h
@@ -823,14 +823,6 @@ extern "C" {
 		#include "gwin/image.h"
 	#endif
 
-	#if GWIN_NEED_LABEL || defined(__DOXYGEN__)
-		#include "gwin/label.h"
-	#endif
-
-	#if GWIN_NEED_LIST || defined(__DOXYGEN__)
-		#include "gwin/list.h"
-	#endif
-
 #endif /* GFX_USE_GWIN */
 
 #endif /* _GWIN_H */