10 files changed, 9 insertions, 11 deletions
diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp
index 66d278aa69..7d2f6a8771 100644
--- a/plugins/Non-IM Contact/src/contactinfo.cpp
+++ b/plugins/Non-IM Contact/src/contactinfo.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "stdafx.h"
 
 INT_PTR CALLBACK DlgProcContactInfo(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp
index a948737802..e8bcf519c0 100644
--- a/plugins/Non-IM Contact/src/dialog.cpp
+++ b/plugins/Non-IM Contact/src/dialog.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #define NIM_HELP_TEXT TranslateT("String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\n\
 file(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\n\
diff --git a/plugins/Non-IM Contact/src/files.cpp b/plugins/Non-IM Contact/src/files.cpp
index 5d5ba5945c..48f85ecd83 100644
--- a/plugins/Non-IM Contact/src/files.cpp
+++ b/plugins/Non-IM Contact/src/files.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "stdafx.h"
 
 INT_PTR exportContacts(WPARAM wParam, LPARAM lParam)
 {
diff --git a/plugins/Non-IM Contact/src/http.cpp b/plugins/Non-IM Contact/src/http.cpp
index 7e8cdbe0cc..23b1064236 100644
--- a/plugins/Non-IM Contact/src/http.cpp
+++ b/plugins/Non-IM Contact/src/http.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    from the web using netlib
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 char *szInfo;
 char *szData;
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp
index b456c1c839..fa668b55d3 100644
--- a/plugins/Non-IM Contact/src/main.cpp
+++ b/plugins/Non-IM Contact/src/main.cpp
@@ -2,7 +2,7 @@
 //	Includes
 //=====================================================
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #include "Version.h"
 
diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp
index 4837219d2c..49ca6cae90 100644
--- a/plugins/Non-IM Contact/src/namereplacing.cpp
+++ b/plugins/Non-IM Contact/src/namereplacing.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "stdafx.h"
 
 int readFileIntoArray(int fileNumber, char *FileContents[])
 {
diff --git a/plugins/Non-IM Contact/src/services.cpp b/plugins/Non-IM Contact/src/services.cpp
index 68b5be26fb..c582f4b7e4 100644
--- a/plugins/Non-IM Contact/src/services.cpp
+++ b/plugins/Non-IM Contact/src/services.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "stdafx.h"
 
 //=======================================================
 // db_get_static
diff --git a/plugins/Non-IM Contact/src/stdafx.cpp b/plugins/Non-IM Contact/src/stdafx.cxx
index 048b14e9d2..6fb37564b7 100644
--- a/plugins/Non-IM Contact/src/stdafx.cpp
+++ b/plugins/Non-IM Contact/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "commonheaders.h"
-\ No newline at end of file
+#include "stdafx.h"
+\ No newline at end of file
diff --git a/plugins/Non-IM Contact/src/commonheaders.h b/plugins/Non-IM Contact/src/stdafx.h
index ac0eab279b..099240c3cf 100644
--- a/plugins/Non-IM Contact/src/commonheaders.h
+++ b/plugins/Non-IM Contact/src/stdafx.h
@@ -4,8 +4,6 @@
 #ifndef COMMONHEADERS
 #define COMMONHEADERS
 
-#define _CRT_SECURE_NO_WARNINGS
-
 #include <windows.h>
 #include <commctrl.h>
 #include <winsock.h>
diff --git a/plugins/Non-IM Contact/src/timer.cpp b/plugins/Non-IM Contact/src/timer.cpp
index 5f19b802f0..32afa0ff35 100644
--- a/plugins/Non-IM Contact/src/timer.cpp
+++ b/plugins/Non-IM Contact/src/timer.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static UINT_PTR timerId = 0;