diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.c b/reactos/base/applications/screensavers/3dtext/3dtext.c
index b11a6c36ff7..a64e3252ecf 100644
--- a/reactos/base/applications/screensavers/3dtext/3dtext.c
+++ b/reactos/base/applications/screensavers/3dtext/3dtext.c
@@ -20,6 +20,15 @@
 
 #include "3dtext.h"
 
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <scrnsave.h>
+#include <math.h>
+#include <GL/glu.h>
+
+#include "resource.h"
+
 static HGLRC hRC;       // Permanent Rendering Context
 static HDC hDC;         // Private GDI Device Context
 
diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.h b/reactos/base/applications/screensavers/3dtext/3dtext.h
index 277616966fd..93b78c60cbb 100644
--- a/reactos/base/applications/screensavers/3dtext/3dtext.h
+++ b/reactos/base/applications/screensavers/3dtext/3dtext.h
@@ -18,18 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <scrnsave.h>
-#include <math.h>
-#include <GL/glu.h>
 #include <tchar.h>
-
-#include "resource.h"
+#include <windef.h>
 
 extern TCHAR m_Text[MAX_PATH];
 
diff --git a/reactos/base/applications/screensavers/3dtext/settings.c b/reactos/base/applications/screensavers/3dtext/settings.c
index a869dbcaa14..7e892ee0ef5 100644
--- a/reactos/base/applications/screensavers/3dtext/settings.c
+++ b/reactos/base/applications/screensavers/3dtext/settings.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-//////////////////////////////////////////////////////////////////
-
 #include "3dtext.h"
 
+#include <winreg.h>
+
 TCHAR m_Text[MAX_PATH] = _T("ReactOS Rocks!");
 
 VOID LoadSettings(VOID)