From 0f5cd35a1b8ff460d2549675e0dc3add4888c761 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 4 Mar 2017 22:23:11 +0000
Subject: [PATCH] timers: Moved includes into timers.h

---
 source/common/timers.cpp | 14 +-------------
 source/common/timers.h   | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/source/common/timers.cpp b/source/common/timers.cpp
index 4ba3e94..d025219 100644
--- a/source/common/timers.cpp
+++ b/source/common/timers.cpp
@@ -16,19 +16,7 @@
 // You should have received a copy of the GNU General Public License along
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
-#include "../actmgr/frmActivityMgr.h"
-#include "../frmContact.h"
-#include "../frmMain.h"
-#include <wx/mstream.h>
-#include <wx/file.h>
-#include <wx/ffile.h>
-#include <wx/filename.h>
-#include <wx/tokenzr.h>
-#include "../bitmaps.h"
-#include "../enums.h"
-#include "../common/preferences.h"
-#include "../common/etag.h"
-#include "../common/dirs.h"
+#include "timers.h"
 
 void wxActTimer::Notify(){
 
diff --git a/source/common/timers.h b/source/common/timers.h
index 0af0942..67b8412 100644
--- a/source/common/timers.h
+++ b/source/common/timers.h
@@ -17,13 +17,26 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include <map>
-#include <wx/timer.h>
-#include <wx/wx.h>
 #include <mutex>
 #include <atomic>
+#include <wx/timer.h>
+#include <wx/wx.h>
+#include <wx/mstream.h>
+#include <wx/file.h>
+#include <wx/ffile.h>
+#include <wx/filename.h>
+#include <wx/tokenzr.h>
+
 #include "../actmgr/frmActivityMgr.h"
 #include "../contacteditor/frmContactEditor.h"
 #include "../connobject/ConnectionObject.h"
+#include "../frmContact.h"
+#include "../frmMain.h"
+#include "../bitmaps.h"
+#include "../enums.h"
+#include "../common/preferences.h"
+#include "../common/etag.h"
+#include "../common/dirs.h"
 #include "etag.h"
 
 #ifndef TIMERS_H
-- 
2.39.2