diff --git a/EAPMethods/src/StdAfx_UI.h b/EAPMethods/src/StdAfx_UI.h
index a2992f5..b57b57f 100644
--- a/EAPMethods/src/StdAfx_UI.h
+++ b/EAPMethods/src/StdAfx_UI.h
@@ -20,6 +20,9 @@
 
 #pragma once
 
+// Prevent warnings from wxWidgets headers
+#define _CRT_SECURE_NO_WARNINGS
+
 #if EAPMETHOD_TYPE == 21
 #include "../../lib/TTLS_UI/include/Module.h"
 #define _EAPMETHOD_PEER_UI eap::peer_ttls_ui
diff --git a/lib/EAPBase_UI/src/StdAfx.h b/lib/EAPBase_UI/src/StdAfx.h
index cd2d874..8395abc 100644
--- a/lib/EAPBase_UI/src/StdAfx.h
+++ b/lib/EAPBase_UI/src/StdAfx.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
-
 #include "../include/EAP_UI.h"
 #include "../include/Module.h"
 
diff --git a/lib/EapHost_UI/src/StdAfx.h b/lib/EapHost_UI/src/StdAfx.h
index fd2dbfc..1548d46 100644
--- a/lib/EapHost_UI/src/StdAfx.h
+++ b/lib/EapHost_UI/src/StdAfx.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
-
 #include "../include/EapHost_UI.h"
 
 #include <WinStd/EAP.h>
diff --git a/lib/GTC_UI/src/StdAfx.h b/lib/GTC_UI/src/StdAfx.h
index b3faff2..af5bb89 100644
--- a/lib/GTC_UI/src/StdAfx.h
+++ b/lib/GTC_UI/src/StdAfx.h
@@ -20,6 +20,4 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
-
 #include "../include/GTC_UI.h"
diff --git a/lib/MSCHAPv2_UI/src/StdAfx.h b/lib/MSCHAPv2_UI/src/StdAfx.h
index 17ae009..1686018 100644
--- a/lib/MSCHAPv2_UI/src/StdAfx.h
+++ b/lib/MSCHAPv2_UI/src/StdAfx.h
@@ -20,6 +20,4 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
-
 #include "../include/MSCHAPv2_UI.h"
diff --git a/lib/PAP_UI/src/StdAfx.h b/lib/PAP_UI/src/StdAfx.h
index 8136c3a..8776361 100644
--- a/lib/PAP_UI/src/StdAfx.h
+++ b/lib/PAP_UI/src/StdAfx.h
@@ -20,6 +20,4 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
-
 #include "../include/PAP_UI.h"
diff --git a/lib/TLS_UI/src/StdAfx.h b/lib/TLS_UI/src/StdAfx.h
index 48e5428..a9aeb1c 100644
--- a/lib/TLS_UI/src/StdAfx.h
+++ b/lib/TLS_UI/src/StdAfx.h
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
+// Prevent warnings from wxWidgets headers
+#define _CRT_SECURE_NO_WARNINGS
 
 #include "../../../include/Version.h"
 
diff --git a/lib/TTLS_UI/src/StdAfx.h b/lib/TTLS_UI/src/StdAfx.h
index fbcfb70..fc8eb81 100644
--- a/lib/TTLS_UI/src/StdAfx.h
+++ b/lib/TTLS_UI/src/StdAfx.h
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
+// Prevent warnings from wxWidgets headers
+#define _CRT_SECURE_NO_WARNINGS
 
 #include "../include/Module.h"
 #include "../include/TTLS_UI.h"