Cosmetic changes.

Library/AboutDialog.cpp

@@ -24,9 +24,6 @@
 #include "resource.h"
 #include "AboutDialog.h"
 #include "../revision-number.h"
-#include <commctrl.h>
-#include <string>
-#include <map>
 
 #define LOGTIMER 1
 

Library/ConfigParser.cpp

@@ -21,7 +21,6 @@
 #include "Litestep.h"
 #include "Rainmeter.h"
 #include "System.h"
-#include <algorithm>
 
 extern CRainmeter* Rainmeter;
 

Library/Error.cpp

@@ -18,7 +18,6 @@
 
 #include "StdAfx.h"
 #include "Error.h"
-#include <stdio.h>
 
 const WCHAR* CError::c_ErrorStrings[] = 
 {

Library/Group.cpp

@@ -19,8 +19,6 @@
 #include "StdAfx.h"
 #include "Group.h"
 #include "ConfigParser.h"
-#include <vector>
-#include <algorithm>
 
 /*
 ** CGroup

Library/Litestep.cpp

@@ -21,10 +21,6 @@
 #include "Error.h"
 #include "Rainmeter.h"
 #include "System.h"
-#include <shellapi.h>
-#include <crtdbg.h>
-#include <stdio.h>
-#include <stdarg.h>
 
 extern CRainmeter* Rainmeter;
 

Library/Measure.cpp

@@ -36,7 +36,6 @@
 #include "Rainmeter.h"
 #include "Error.h"
 #include "Litestep.h"
-#include <algorithm>
 
 const int MEDIAN_SIZE = 7;
 

Library/MeasureCalc.cpp

@@ -19,9 +19,7 @@
 #include "StdAfx.h"
 #include "MeasureCalc.h"
 #include "Rainmeter.h"
-#include <cstdlib> 
-#include <ctime> 
-#include <sstream>  
+
 using namespace std;
 
 hqStrMap* CMeasureCalc::c_VarMap = NULL;

Library/MeasureTime.cpp

@@ -21,9 +21,6 @@
 #include "StdAfx.h"
 #include "MeasureTime.h"
 #include "Rainmeter.h"
-#include <time.h>
-#include <errno.h>
-#include <crtdbg.h>
 
 void MeasureTime_CRTInvalidParameterHandler(const wchar_t* expression, const wchar_t* function,  const wchar_t* file, unsigned int line, uintptr_t pReserved)
 {
@@ -62,7 +59,7 @@ CMeasureTime::CMeasureTime(CMeterWindow* meterWindow) : CMeasure(meterWindow)
 	 * the operating system is queried to obtain the default value 
 	 * for the variable. 
 	 */
-	tzset();
+	_tzset();
 
 	m_DeltaTime.QuadPart = 0;
 	m_Time.QuadPart = 0;

Library/MeasureUptime.cpp

@@ -19,7 +19,6 @@
 #include "StdAfx.h"
 #include "MeasureUptime.h"
 #include "Rainmeter.h"
-#include <time.h>
 
 /*
 ** CMeasureUptime

Library/MeterImage.cpp

@@ -21,7 +21,6 @@
 #include "Measure.h"
 #include "Error.h"
 #include "Rainmeter.h"
-#include <math.h>
 
 extern CRainmeter* Rainmeter;
 

Library/MeterLine.cpp

@@ -20,8 +20,6 @@
 #include "MeterLine.h"
 #include "Measure.h"
 #include "Error.h"
-#include <crtdbg.h>
-#include <gdiplus.h>
 
 using namespace Gdiplus;
 

Library/MeterRoundLine.cpp

@@ -20,9 +20,6 @@
 #include "MeterRoundLine.h"
 #include "Measure.h"
 #include "Error.h"
-#include <crtdbg.h>
-#include <math.h>
-#include <gdiplus.h>
 
 using namespace Gdiplus;
 #define PI 3.14159265

Library/MeterString.h

@@ -21,6 +21,7 @@
 
 #include "Meter.h"
 #include "MeterWindow.h"
+
 namespace Gdiplus
 {
 class Font;

Library/MeterWindow.cpp

@@ -17,21 +17,15 @@
 */
 
 #include "StdAfx.h"
-#include <windows.h>
-#include <gdiplus.h>
 #include "MeterWindow.h"
 #include "Rainmeter.h"
 #include "System.h"
 #include "Error.h"
-#include <math.h>
-#include <time.h>
 #include "Meter.h"
 #include "Measure.h"
 #include "AboutDialog.h"
 #include "resource.h"
 #include "Litestep.h"
-#include <Mmsystem.h>
-#include <assert.h>
 #include "MeasureCalc.h"
 #include "MeasureNet.h"
 #include "MeasurePlugin.h"

Library/Rainmeter.cpp

@@ -25,14 +25,6 @@
 #include "MeterString.h"
 #include "Resource.h"
 #include "UpdateCheck.h"
-#include <assert.h>
-#include <time.h>
-#include <commctrl.h>
-#include <gdiplus.h>
-#include <fstream>
-#include <iostream>
-#include <shlobj.h>
-#include <shlwapi.h>
 
 using namespace Gdiplus;
 

Library/Rainmeter.h

@@ -20,12 +20,12 @@
 #define __RAINMETER_H__
 
 #include <windows.h>
-#include "Litestep.h"
-#include "MeterWindow.h"
-#include "TrayWindow.h"
 #include <map>
 #include <vector>
 #include <string>
+#include "Litestep.h"
+#include "MeterWindow.h"
+#include "TrayWindow.h"
 
 #define MAX_LINE_LENGTH 4096
 

Library/StdAfx.h

@@ -38,6 +38,7 @@
 #include <Mmsystem.h>
 #include <shlobj.h>
 #include <shlwapi.h>
+#include <Wininet.h>
 #include <winperf.h>
 #include <Windns.h>
 #include <Ipexport.h>
@@ -49,19 +50,24 @@
 #include <vector>
 #include <hash_map>
 #include <list>
+#include <set>
 #include <sstream>
 #include <ctime>
 #include <cstdlib>
+#include <sstream>
 #include <fstream>
 #include <iostream>
 #include <algorithm>
 
 // RUNTIME
 #include <stdio.h>
+#include <errno.h>
 #include <time.h>
 #include <math.h>
 #include <time.h>
 #include <assert.h>
 #include <io.h>
+#include <stdarg.h>
+#include <process.h>
 
 #endif

Library/TrayWindow.cpp

@@ -25,8 +25,6 @@
 #include "Error.h"
 #include "RainmeterQuery.h"
 #include "../revision-number.h"
-#include <io.h>
-#include <ShellAPI.h>
 
 #define TRAYTIMER 3
 

Library/UpdateCheck.cpp

@@ -17,12 +17,8 @@
 */
 
 #include "StdAfx.h"
-#include <windows.h>
 #include "Litestep.h"
 #include "Rainmeter.h"
-#include <string>
-#include <Wininet.h>
-#include <process.h>
 
 extern CRainmeter* Rainmeter;