diff --git a/Library/DialogAbout.cpp b/Library/DialogAbout.cpp
index aaf0e994..3971c927 100644
--- a/Library/DialogAbout.cpp
+++ b/Library/DialogAbout.cpp
@@ -20,6 +20,7 @@
 #include "Rainmeter.h"
 #include "System.h"
 #include "MeterWindow.h"
+#include "TrayWindow.h"
 #include "Measure.h"
 #include "resource.h"
 #include "DialogAbout.h"
diff --git a/Library/DialogAbout.h b/Library/DialogAbout.h
index 9fecb310..884b0c7b 100644
--- a/Library/DialogAbout.h
+++ b/Library/DialogAbout.h
@@ -19,8 +19,6 @@
 #ifndef _DIALOGABOUT_H_
 #define _DIALOGABOUT_H_
 
-#include "MeterWindow.h"
-#include "TrayWindow.h"
 #include "Dialog.h"
 
 class CDialogAbout : public CDialog
diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp
index dfe2698d..5a6e9d9a 100644
--- a/Library/DialogManage.cpp
+++ b/Library/DialogManage.cpp
@@ -20,6 +20,7 @@
 #include "Rainmeter.h"
 #include "System.h"
 #include "MeterWindow.h"
+#include "TrayWindow.h"
 #include "Measure.h"
 #include "resource.h"
 #include "DialogManage.h"
diff --git a/Library/DialogManage.h b/Library/DialogManage.h
index 3f0bba55..935bf639 100644
--- a/Library/DialogManage.h
+++ b/Library/DialogManage.h
@@ -19,9 +19,6 @@
 #ifndef _DIALOGMANAGE_H_
 #define _DIALOGMANAGE_H_
 
-#include "MeterWindow.h"
-#include "Rainmeter.h"
-#include "TrayWindow.h"
 #include "Dialog.h"
 
 class CDialogManage : public CDialog