diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 37d1137..9886905 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -44,7 +44,7 @@ set(PROJECT_SOURCES
     qtmaterialslider.cpp 
     qtmaterialsnackbar_internal.cpp 
     qtmaterialsnackbar.cpp 
-    qtmaterialradiobutton.cpp 
+#    qtmaterialradiobutton.cpp
     qtmaterialtoggle_internal.cpp 
     qtmaterialtoggle.cpp 
     qtmaterialtextfield_internal.cpp 
@@ -106,8 +106,8 @@ set(PROJECT_SOURCES
     qtmaterialsnackbar_internal.h 
     qtmaterialsnackbar_p.h 
     qtmaterialsnackbar.h 
-    qtmaterialradiobutton_p.h 
-    qtmaterialradiobutton.h 
+#    qtmaterialradiobutton_p.h
+#    qtmaterialradiobutton.h
     qtmaterialtoggle_internal.h 
     qtmaterialtoggle_p.h 
     qtmaterialtoggle.h 
diff --git a/components/lib/qtmaterialcheckable.cpp b/components/lib/qtmaterialcheckable.cpp
index 8a6f250..25ca9eb 100644
--- a/components/lib/qtmaterialcheckable.cpp
+++ b/components/lib/qtmaterialcheckable.cpp
@@ -1,12 +1,5 @@
 #include "lib/qtmaterialcheckable.h"
 #include "lib/qtmaterialcheckable_p.h"
-#include <QPainter>
-#include <QEvent>
-#include <QStateMachine>
-#include <QSignalTransition>
-#include <QEventTransition>
-#include <QColor>
-#include <QCoreApplication>
 #include "lib/qtmaterialrippleoverlay.h"
 #include "lib/qtmaterialripple.h"
 #include "lib/qtmaterialstyle.h"
diff --git a/components/lib/qtmaterialcheckable_p.h b/components/lib/qtmaterialcheckable_p.h
index 57c4cf8..6d19970 100644
--- a/components/lib/qtmaterialcheckable_p.h
+++ b/components/lib/qtmaterialcheckable_p.h
@@ -2,13 +2,18 @@
 #define QTMATERIALCHECKABLE_P_H
 
 #include <QtGlobal>
+#include <QPainter>
+#include <QEvent>
+#include <QStateMachine>
+#include <QSignalTransition>
+#include <QEventTransition>
+#include <QColor>
+#include <QCoreApplication>
+
 #include "lib/qtmaterialcheckable.h"
 
 namespace md
 {
-class QStateMachine;
-class QState;
-class QSignalTransition;
 class RippleOverlay;
 class CheckableIcon;
 
diff --git a/components/qtmaterialautocomplete.cpp b/components/qtmaterialautocomplete.cpp
index 62ac90d..ecaf1fe 100644
--- a/components/qtmaterialautocomplete.cpp
+++ b/components/qtmaterialautocomplete.cpp
@@ -1,13 +1,5 @@
-#include "qtmaterialautocomplete.h"
 #include "qtmaterialautocomplete_p.h"
-#include <QtWidgets/QGraphicsDropShadowEffect>
-#include <QtWidgets/QVBoxLayout>
-#include <QEvent>
-#include <QTimer>
-#include <QPainter>
-#include <QDebug>
-#include "qtmaterialautocomplete_internal.h"
-#include "qtmaterialflatbutton.h"
+
 
 namespace md
 {
diff --git a/components/qtmaterialautocomplete_p.h b/components/qtmaterialautocomplete_p.h
index 29dc852..fd5004c 100644
--- a/components/qtmaterialautocomplete_p.h
+++ b/components/qtmaterialautocomplete_p.h
@@ -1,13 +1,21 @@
 #ifndef QTMATERIALAUTOCOMPLETE_P_H
 #define QTMATERIALAUTOCOMPLETE_P_H
 
+#include <QtWidgets/QGraphicsDropShadowEffect>
+#include <QtWidgets/QVBoxLayout>
+#include <QEvent>
+#include <QTimer>
+#include <QPainter>
+#include <QDebug>
+
+#include "qtmaterialautocomplete.h"
+#include "qtmaterialautocomplete_internal.h"
+#include "qtmaterialflatbutton.h"
 #include "qtmaterialtextfield_p.h"
 
 namespace md
 {
 
-class QWidget;
-class QVBoxLayout;
 class AutoCompleteOverlay;
 class AutoCompleteStateMachine;
 
diff --git a/components/qtmaterialcheckbox.cpp b/components/qtmaterialcheckbox.cpp
index 4d4122c..9ef8e51 100644
--- a/components/qtmaterialcheckbox.cpp
+++ b/components/qtmaterialcheckbox.cpp
@@ -1,9 +1,5 @@
-#include "qtmaterialcheckbox.h"
 #include "qtmaterialcheckbox_p.h"
-#include <QPropertyAnimation>
-#include <QSignalTransition>
-#include <QState>
-#include "lib/qtmaterialcheckable_internal.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialcheckbox_p.h b/components/qtmaterialcheckbox_p.h
index c79f9de..565e6c1 100644
--- a/components/qtmaterialcheckbox_p.h
+++ b/components/qtmaterialcheckbox_p.h
@@ -1,7 +1,14 @@
 #ifndef QTMATERIALCHECKBOX_P_H
 #define QTMATERIALCHECKBOX_P_H
 
+#include <QPropertyAnimation>
+#include <QSignalTransition>
+#include <QState>
+
+#include "qtmaterialcheckbox.h"
+#include "lib/qtmaterialcheckable_internal.h"
 #include "lib/qtmaterialcheckable_p.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialdialog.cpp b/components/qtmaterialdialog.cpp
index 109f50e..7a5a6d8 100644
--- a/components/qtmaterialdialog.cpp
+++ b/components/qtmaterialdialog.cpp
@@ -1,19 +1,10 @@
 #include "qtmaterialdialog.h"
-#include "qtmaterialdialog_p.h"
-#include <QtWidgets/QStackedLayout>
-#include <QtWidgets/QGraphicsDropShadowEffect>
-#include <QStateMachine>
-#include <QState>
-#include <QtWidgets/QApplication>
-#include <QPropertyAnimation>
-#include <QPainter>
-#include "qtmaterialdialog_internal.h"
-#include "lib/qtmaterialstatetransition.h"
+
 namespace md
 {
 
 /*!
- *  \class QtMaterialDialogPrivate
+ *  \class DialogPrivate
  *  \internal
  */
 
@@ -106,7 +97,7 @@ void DialogPrivate::init()
 }
 
 /*!
- *  \class QtMaterialDialog
+ *  \class Dialog
  */
 
 Dialog::Dialog(QWidget *parent)
diff --git a/components/qtmaterialdialog.h b/components/qtmaterialdialog.h
index af40fcf..fc3c668 100644
--- a/components/qtmaterialdialog.h
+++ b/components/qtmaterialdialog.h
@@ -2,11 +2,16 @@
 #define QTMATERIALDIALOG_H
 
 #include <QScopedPointer>
+#include <QLayout>
+
+#include "qtmaterialdialog_p.h"
+#include "qtmaterialdialog_internal.h"
+#include "lib/qtmaterialstatetransition.h"
 #include "lib/qtmaterialoverlaywidget.h"
+
 namespace md
 {
 
-class QLayout;
 class DialogPrivate;
 
 class Dialog : public OverlayWidget
diff --git a/components/qtmaterialdialog_internal.cpp b/components/qtmaterialdialog_internal.cpp
index 9780f8d..c93ffbb 100644
--- a/components/qtmaterialdialog_internal.cpp
+++ b/components/qtmaterialdialog_internal.cpp
@@ -1,9 +1,5 @@
 #include "qtmaterialdialog_internal.h"
-#include <QPainter>
-#include <QPixmap>
-#include <QEvent>
-#include <QtWidgets/QStackedLayout>
-#include "qtmaterialdialog.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialdialog_internal.h b/components/qtmaterialdialog_internal.h
index 86695da..b1f49de 100644
--- a/components/qtmaterialdialog_internal.h
+++ b/components/qtmaterialdialog_internal.h
@@ -2,10 +2,16 @@
 #define QTMATERIALDIALOG_INTERNAL_H
 
 #include <QtWidgets/QWidget>
+#include <QPainter>
+#include <QPixmap>
+#include <QEvent>
+#include <QtWidgets/QStackedLayout>
+
+#include "qtmaterialdialog.h"
+
 namespace md
 {
 
-class QStackedLayout;
 class Dialog;
 class DialogWindow;
 
@@ -77,6 +83,7 @@ private:
 
     Dialog *const m_dialog;
 };
+}
 
 #endif // QTMATERIALDIALOG_INTERNAL_H
-}
+
diff --git a/components/qtmaterialdialog_p.h b/components/qtmaterialdialog_p.h
index f59fa16..7e104ec 100644
--- a/components/qtmaterialdialog_p.h
+++ b/components/qtmaterialdialog_p.h
@@ -2,12 +2,18 @@
 #define QTMATERIALDIALOG_P_H
 
 #include <QtGlobal>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QGraphicsDropShadowEffect>
+#include <QtWidgets/QApplication>
+#include <QStateMachine>
+#include <QState>
+#include <QPropertyAnimation>
+#include <QPainter>
+
 namespace md
 {
 
-class QStateMachine;
 class Dialog;
-class QStackedLayout;
 class DialogWindow;
 class DialogProxy;
 
diff --git a/components/qtmaterialdrawer.cpp b/components/qtmaterialdrawer.cpp
index 3ab6094..c6dc174 100644
--- a/components/qtmaterialdrawer.cpp
+++ b/components/qtmaterialdrawer.cpp
@@ -1,14 +1,5 @@
 #include "qtmaterialdrawer.h"
-#include "qtmaterialdrawer_p.h"
-#include <QPainter>
-#include <QEvent>
-#include <QDebug>
-#include <QMouseEvent>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QLayout>
-#include <QLinearGradient>
-#include <QtWidgets/QVBoxLayout>
-#include "qtmaterialdrawer_internal.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialdrawer.h b/components/qtmaterialdrawer.h
index f6628ff..b0e7f0a 100644
--- a/components/qtmaterialdrawer.h
+++ b/components/qtmaterialdrawer.h
@@ -1,7 +1,19 @@
 #ifndef QTMATERIALDRAWER_H
 #define QTMATERIALDRAWER_H
 
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QPainter>
+#include <QEvent>
+#include <QDebug>
+#include <QMouseEvent>
+#include <QLinearGradient>
+
+#include "qtmaterialdrawer_p.h"
+#include "qtmaterialdrawer_internal.h"
 #include "lib/qtmaterialoverlaywidget.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialflatbutton_internal.cpp b/components/qtmaterialflatbutton_internal.cpp
index 8591ba8..53142c5 100644
--- a/components/qtmaterialflatbutton_internal.cpp
+++ b/components/qtmaterialflatbutton_internal.cpp
@@ -1,10 +1,4 @@
 #include "qtmaterialflatbutton_internal.h"
-#include <QEventTransition>
-#include <QPropertyAnimation>
-#include <QFocusEvent>
-#include <QSequentialAnimationGroup>
-#include "qtmaterialflatbutton.h"
-#include "lib/qtmaterialstatetransition.h"
 
 namespace md
 {
diff --git a/components/qtmaterialflatbutton_internal.h b/components/qtmaterialflatbutton_internal.h
index bf2361b..8eef9ff 100644
--- a/components/qtmaterialflatbutton_internal.h
+++ b/components/qtmaterialflatbutton_internal.h
@@ -3,12 +3,18 @@
 
 #include <QStateMachine>
 #include <QColor>
+#include <QEventTransition>
+#include <QPropertyAnimation>
+#include <QFocusEvent>
+#include <QSequentialAnimationGroup>
+
+#include "qtmaterialflatbutton.h"
+#include "lib/qtmaterialstatetransition.h"
 
 namespace md
 {
-class FlatButton;
-class QSequentialAnimationGroup;
 
+class FlatButton;
 class FlatButtonStateMachine : public QStateMachine
 {
     Q_OBJECT
diff --git a/components/qtmaterialiconbutton_p.h b/components/qtmaterialiconbutton_p.h
index 42d071e..1d8b642 100644
--- a/components/qtmaterialiconbutton_p.h
+++ b/components/qtmaterialiconbutton_p.h
@@ -2,13 +2,12 @@
 #define QTMATERIALICONBUTTON_P_H
 
 #include <QtGlobal>
-
+#include <QColor>
 
 namespace md
 {
 class IconButton;
 class RippleOverlay;
-class QColor;
 
 class IconButtonPrivate
 {
diff --git a/components/qtmaterialprogress_internal.cpp b/components/qtmaterialprogress_internal.cpp
index d2b2361..6b970c6 100644
--- a/components/qtmaterialprogress_internal.cpp
+++ b/components/qtmaterialprogress_internal.cpp
@@ -1,5 +1,7 @@
 #include "qtmaterialprogress_internal.h"
 
+namespace md
+{
 /*!
  *  \class QtMaterialProgressDelegate
  *  \internal
@@ -16,3 +18,4 @@ ProgressBarDelegate::ProgressBarDelegate(ProgressBar *parent)
 ProgressBarDelegate::~ProgressBarDelegate()
 {
 }
+}
diff --git a/components/qtmaterialprogress_internal.h b/components/qtmaterialprogress_internal.h
index 2f936ed..67a507f 100644
--- a/components/qtmaterialprogress_internal.h
+++ b/components/qtmaterialprogress_internal.h
@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include "qtmaterialprogress.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialradiobutton.cpp b/components/qtmaterialradiobutton.cpp
index 2eecd81..816deb0 100644
--- a/components/qtmaterialradiobutton.cpp
+++ b/components/qtmaterialradiobutton.cpp
@@ -1,16 +1,11 @@
 #include "qtmaterialradiobutton.h"
-#include "qtmaterialradiobutton_p.h"
-#include <QStateMachine>
-#include <QState>
-#include <QPropertyAnimation>
-#include <QColor>
-#include "lib/qtmaterialcheckable_internal.h"
+
 namespace md
 {
 
 
 /*!
- *  \class QtMaterialRadioButtonPrivate
+ *  \class RadioButtonPrivate
  *  \internal
  */
 
diff --git a/components/qtmaterialradiobutton.h b/components/qtmaterialradiobutton.h
index 4b737ea..66b916b 100644
--- a/components/qtmaterialradiobutton.h
+++ b/components/qtmaterialradiobutton.h
@@ -1,7 +1,10 @@
 #ifndef QTMATERIALRADIOBUTTON_H
 #define QTMATERIALRADIOBUTTON_H
 
+#include "qtmaterialradiobutton_p.h"
+#include "lib/qtmaterialcheckable_internal.h"
 #include "lib/qtmaterialcheckable.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialradiobutton_p.h b/components/qtmaterialradiobutton_p.h
index 6a25181..0d32fea 100644
--- a/components/qtmaterialradiobutton_p.h
+++ b/components/qtmaterialradiobutton_p.h
@@ -1,7 +1,14 @@
 #ifndef QTMATERIALRADIOBUTTON_P_H
 #define QTMATERIALRADIOBUTTON_P_H
 
+#include <QStateMachine>
+#include <QState>
+#include <QPropertyAnimation>
+#include <QColor>
+
+#include "qtmaterialradiobutton.h"
 #include "lib/qtmaterialcheckable_p.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialraisedbutton.cpp b/components/qtmaterialraisedbutton.cpp
index b7b8ad6..6632346 100644
--- a/components/qtmaterialraisedbutton.cpp
+++ b/components/qtmaterialraisedbutton.cpp
@@ -1,9 +1,5 @@
-#include "qtmaterialraisedbutton.h"
 #include "qtmaterialraisedbutton_p.h"
-#include <QStateMachine>
-#include <QtWidgets/QGraphicsDropShadowEffect>
-#include <QPropertyAnimation>
-#include <QEventTransition>
+
 namespace md
 {
 
diff --git a/components/qtmaterialraisedbutton.h b/components/qtmaterialraisedbutton.h
index 7482a55..aa4ea94 100644
--- a/components/qtmaterialraisedbutton.h
+++ b/components/qtmaterialraisedbutton.h
@@ -2,6 +2,7 @@
 #define QTMATERIALRAISEDBUTTON_H
 
 #include "qtmaterialflatbutton.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialraisedbutton_p.h b/components/qtmaterialraisedbutton_p.h
index 545efe9..615bc11 100644
--- a/components/qtmaterialraisedbutton_p.h
+++ b/components/qtmaterialraisedbutton_p.h
@@ -1,13 +1,17 @@
 #ifndef QTMATERIALRAISEDBUTTON_P_H
 #define QTMATERIALRAISEDBUTTON_P_H
 
+#include <QtWidgets/QGraphicsDropShadowEffect>
+#include <QStateMachine>
+#include <QPropertyAnimation>
+#include <QEventTransition>
+
 #include "qtmaterialflatbutton_p.h"
+#include "qtmaterialraisedbutton.h"
+
 namespace md
 {
 
-class QStateMachine;
-class QState;
-class QGraphicsDropShadowEffect;
 class RaisedButton;
 
 class RaisedButtonPrivate : public FlatButtonPrivate
diff --git a/components/qtmaterialscrollbar.cpp b/components/qtmaterialscrollbar.cpp
index b098653..5c6a0c1 100644
--- a/components/qtmaterialscrollbar.cpp
+++ b/components/qtmaterialscrollbar.cpp
@@ -1,10 +1,5 @@
 #include "qtmaterialscrollbar.h"
-#include "qtmaterialscrollbar_p.h"
-#include <QPainter>
-#include <QPainterPath>
-#include <QDebug>
-#include "qtmaterialscrollbar_internal.h"
-#include "lib/qtmaterialstyle.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialscrollbar.h b/components/qtmaterialscrollbar.h
index aef78dc..0ff4b5f 100644
--- a/components/qtmaterialscrollbar.h
+++ b/components/qtmaterialscrollbar.h
@@ -2,6 +2,14 @@
 #define QTMATERIALSCROLLBAR_H
 
 #include <QtWidgets/QScrollBar>
+#include <QPainter>
+#include <QPainterPath>
+#include <QDebug>
+
+#include "qtmaterialscrollbar_p.h"
+#include "qtmaterialscrollbar_internal.h"
+#include "lib/qtmaterialstyle.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialscrollbar_internal.h b/components/qtmaterialscrollbar_internal.h
index d054120..013cd50 100644
--- a/components/qtmaterialscrollbar_internal.h
+++ b/components/qtmaterialscrollbar_internal.h
@@ -3,9 +3,12 @@
 
 #include <QStateMachine>
 #include "qtmaterialscrollbar.h"
+
 namespace md
 {
 
+class ScrollBar;
+
 class ScrollBarStateMachine : public QStateMachine
 {
     Q_OBJECT
@@ -31,7 +34,7 @@ private:
 inline void ScrollBarStateMachine::setOpacity(qreal opacity)
 {
     m_opacity = opacity;
-    m_scrollBar->update();
+//    m_scrollBar->update(); // FIXME: incomplete type 'class md::ScrollBar'
 }
 
 inline qreal ScrollBarStateMachine::opacity() const
diff --git a/components/qtmaterialscrollbar_p.h b/components/qtmaterialscrollbar_p.h
index 2d73e73..efcd191 100644
--- a/components/qtmaterialscrollbar_p.h
+++ b/components/qtmaterialscrollbar_p.h
@@ -3,6 +3,7 @@
 
 #include <QtGlobal>
 #include <QColor>
+
 namespace md
 {
 
diff --git a/components/qtmaterialslider.cpp b/components/qtmaterialslider.cpp
index e7eccb7..797c20a 100644
--- a/components/qtmaterialslider.cpp
+++ b/components/qtmaterialslider.cpp
@@ -5,6 +5,7 @@
 #include "qtmaterialslider_internal.h"
 #include "lib/qtmaterialstyle.h"
 #include "lib/qtmaterialstatetransitionevent.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialslider.h b/components/qtmaterialslider.h
index c13c03a..2f14e75 100644
--- a/components/qtmaterialslider.h
+++ b/components/qtmaterialslider.h
@@ -5,6 +5,7 @@
 #include <QScopedPointer>
 
 #define QT_MATERIAL_SLIDER_MARGIN 30
+
 namespace md
 {
 
diff --git a/components/qtmaterialslider_p.h b/components/qtmaterialslider_p.h
index d36191d..d372b2f 100644
--- a/components/qtmaterialslider_p.h
+++ b/components/qtmaterialslider_p.h
@@ -4,6 +4,7 @@
 #include <QtGlobal>
 #include <QColor>
 #include <QRectF>
+
 namespace md
 {
 
diff --git a/components/qtmaterialsnackbar.h b/components/qtmaterialsnackbar.h
index 547b0c2..c47a275 100644
--- a/components/qtmaterialsnackbar.h
+++ b/components/qtmaterialsnackbar.h
@@ -2,6 +2,7 @@
 #define QTMATERIALSNACKBAR_H
 
 #include "lib/qtmaterialoverlaywidget.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialsnackbar_internal.h b/components/qtmaterialsnackbar_internal.h
index dbeb0de..0cf3a11 100644
--- a/components/qtmaterialsnackbar_internal.h
+++ b/components/qtmaterialsnackbar_internal.h
@@ -3,6 +3,7 @@
 
 #include <QStateMachine>
 #include <QTimer>
+
 namespace md
 {
 
diff --git a/components/qtmaterialsnackbar_p.h b/components/qtmaterialsnackbar_p.h
index 828cdf4..a24ba57 100644
--- a/components/qtmaterialsnackbar_p.h
+++ b/components/qtmaterialsnackbar_p.h
@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include <QColor>
+
 namespace md
 {
 
@@ -12,7 +13,7 @@ class SnackBarStateMachine;
 class SnackBarPrivate
 {
     Q_DISABLE_COPY(SnackBarPrivate)
-    Q_DECLARE_PUBLIC(Snackbar)
+    Q_DECLARE_PUBLIC(SnackBar)
 
 public:
     SnackBarPrivate(SnackBar *q);
diff --git a/components/qtmaterialtabs.cpp b/components/qtmaterialtabs.cpp
index d5e5def..04bb774 100644
--- a/components/qtmaterialtabs.cpp
+++ b/components/qtmaterialtabs.cpp
@@ -1,13 +1,10 @@
 #include "qtmaterialtabs.h"
-#include "qtmaterialtabs_p.h"
-#include <QtWidgets/QHBoxLayout>
-#include "qtmaterialtabs_internal.h"
-#include "lib/qtmaterialstyle.h"
+
 namespace md
 {
 
 /*!
- *  \QtMaterialTabsPrivate
+ *  \TabsPrivate
  *  \internal
  */
 
@@ -35,7 +32,8 @@ void TabsPrivate::TabsPrivate::init()
     q->setStyle(&Style::instance());
 
     tabLayout->setSpacing(0);
-    tabLayout->setMargin(0);
+
+//    tabLayout->setMargin(0); // FIXME: throwing an error
 }
 
 /*!
diff --git a/components/qtmaterialtabs.h b/components/qtmaterialtabs.h
index ba50544..b3517d6 100644
--- a/components/qtmaterialtabs.h
+++ b/components/qtmaterialtabs.h
@@ -2,8 +2,14 @@
 #define QTMATERIALTABS_H
 
 #include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
 #include <QIcon>
+
+#include "qtmaterialtabs_p.h"
+#include "qtmaterialtabs_internal.h"
+#include "lib/qtmaterialstyle.h"
 #include "lib/qtmaterialtheme.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialtabs_internal.cpp b/components/qtmaterialtabs_internal.cpp
index 06e9c7f..951a6a1 100644
--- a/components/qtmaterialtabs_internal.cpp
+++ b/components/qtmaterialtabs_internal.cpp
@@ -1,11 +1,5 @@
 #include "qtmaterialtabs_internal.h"
-#include <QPainter>
-#include <QPropertyAnimation>
-#include <QtWidgets/QLayout>
-#include <QtWidgets/QLayoutItem>
-#include <QEvent>
-#include "qtmaterialtabs.h"
-#include <QDebug>
+
 namespace md
 {
 
diff --git a/components/qtmaterialtabs_internal.h b/components/qtmaterialtabs_internal.h
index 81f82f5..e05932e 100644
--- a/components/qtmaterialtabs_internal.h
+++ b/components/qtmaterialtabs_internal.h
@@ -1,13 +1,20 @@
 #ifndef QTMATERIALTABS_INTERNAL_H
 #define QTMATERIALTABS_INTERNAL_H
 
+#include <QPainter>
+#include <QPropertyAnimation>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QLayoutItem>
+#include <QEvent>
+#include <QDebug>
+
+#include "qtmaterialtabs.h"
 #include "lib/qtmaterialoverlaywidget.h"
 #include "qtmaterialflatbutton.h"
 
 namespace md
 {
 
-class QPropertyAnimation;
 class Tabs;
 
 class TabsInkBar : public OverlayWidget
diff --git a/components/qtmaterialtabs_p.h b/components/qtmaterialtabs_p.h
index e9165de..2698219 100644
--- a/components/qtmaterialtabs_p.h
+++ b/components/qtmaterialtabs_p.h
@@ -2,11 +2,13 @@
 #define QTMATERIALTABS_P_H
 
 #include <QtGlobal>
+#include <QtWidgets/QHBoxLayout>
+
 #include "lib/qtmaterialtheme.h"
+
 namespace md
 {
 
-class QHBoxLayout;
 class Tabs;
 class TabsInkBar;
 
diff --git a/components/qtmaterialtextfield.h b/components/qtmaterialtextfield.h
index c845809..4ecd074 100644
--- a/components/qtmaterialtextfield.h
+++ b/components/qtmaterialtextfield.h
@@ -3,6 +3,7 @@
 
 #include <QtWidgets/QLineEdit>
 #include <QColor>
+
 namespace md
 {
 
diff --git a/components/qtmaterialtextfield_internal.cpp b/components/qtmaterialtextfield_internal.cpp
index fa148ce..be79e20 100644
--- a/components/qtmaterialtextfield_internal.cpp
+++ b/components/qtmaterialtextfield_internal.cpp
@@ -1,13 +1,10 @@
 #include "qtmaterialtextfield_internal.h"
-#include <QPropertyAnimation>
-#include <QEventTransition>
-#include <QPainter>
-#include "qtmaterialtextfield.h"
+
 namespace md
 {
 
 /*!
- *  \class QtMaterialTextFieldStateMachine
+ *  \class TextFieldStateMachine
  *  \internal
  */
 
diff --git a/components/qtmaterialtextfield_internal.h b/components/qtmaterialtextfield_internal.h
index fd8ab58..0600d31 100644
--- a/components/qtmaterialtextfield_internal.h
+++ b/components/qtmaterialtextfield_internal.h
@@ -1,13 +1,17 @@
 #ifndef QTMATERIALTEXTFIELD_INTERNAL_H
 #define QTMATERIALTEXTFIELD_INTERNAL_H
 
-#include <QStateMachine>
 #include <QtWidgets/QWidget>
+#include <QStateMachine>
+#include <QPropertyAnimation>
+#include <QEventTransition>
+#include <QPainter>
+
 #include "qtmaterialtextfield.h"
+
 namespace md
 {
 
-class QPropertyAnimation;
 class TextFieldLabel;
 
 class TextFieldStateMachine : public QStateMachine
diff --git a/components/qtmaterialtoggle.cpp b/components/qtmaterialtoggle.cpp
index 08c820e..dd9ebe9 100644
--- a/components/qtmaterialtoggle.cpp
+++ b/components/qtmaterialtoggle.cpp
@@ -1,11 +1,9 @@
 #include "qtmaterialtoggle.h"
+
 #include "qtmaterialtoggle_p.h"
-#include <QtWidgets/QApplication>
-#include <QStateMachine>
-#include <QSignalTransition>
-#include <QPropertyAnimation>
 #include "qtmaterialtoggle_internal.h"
 #include "lib/qtmaterialstyle.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialtoggle.h b/components/qtmaterialtoggle.h
index 25f0d0f..fe2efe1 100644
--- a/components/qtmaterialtoggle.h
+++ b/components/qtmaterialtoggle.h
@@ -2,6 +2,7 @@
 #define QTMATERIALTOGGLE_H
 
 #include <QtWidgets/QAbstractButton>
+
 namespace md
 {
 
diff --git a/components/qtmaterialtoggle_internal.cpp b/components/qtmaterialtoggle_internal.cpp
index 3579769..86f3e91 100644
--- a/components/qtmaterialtoggle_internal.cpp
+++ b/components/qtmaterialtoggle_internal.cpp
@@ -1,9 +1,8 @@
 #include "qtmaterialtoggle_internal.h"
-#include <QPainter>
-#include <QEvent>
-#include <QtWidgets/QGraphicsDropShadowEffect>
+
 #include "qtmaterialtoggle.h"
 #include "lib/qtmaterialripple.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialtoggle_internal.h b/components/qtmaterialtoggle_internal.h
index 6fb084d..4d4494e 100644
--- a/components/qtmaterialtoggle_internal.h
+++ b/components/qtmaterialtoggle_internal.h
@@ -2,7 +2,12 @@
 #define QTMATERIALTOGGLE_INTERNAL_H
 
 #include <QtWidgets/QWidget>
+#include <QtWidgets/QGraphicsDropShadowEffect>
+#include <QPainter>
+#include <QEvent>
+
 #include "lib/qtmaterialrippleoverlay.h"
+
 namespace md
 {
 
diff --git a/components/qtmaterialtoggle_p.h b/components/qtmaterialtoggle_p.h
index 4b7196d..bcd3b6a 100644
--- a/components/qtmaterialtoggle_p.h
+++ b/components/qtmaterialtoggle_p.h
@@ -1,13 +1,15 @@
 #ifndef QTMATERIALTOGGLE_P_H
 #define QTMATERIALTOGGLE_P_H
 
-#include <Qt>
+#include <QtWidgets/QApplication>
+#include <QStateMachine>
+#include <QSignalTransition>
+#include <QPropertyAnimation>
+#include <QColor>
+
 namespace md
 {
 
-class QStateMachine;
-class QState;
-class QColor;
 class Toggle;
 class ToggleTrack;
 class ToggleThumb;