diff --git a/NifExport/NifExport.rc b/NifExport/NifExport.rc
index 12a6994d0b27ba51c77c1acaaf2ef4e40e5e345a..c72a72a16b510a943cc26de8aa616a1df0fb82fe 100755
--- a/NifExport/NifExport.rc
+++ b/NifExport/NifExport.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 #ifndef NIFPLUGINS
 #define DLLNAME "NifExporter.dle"  // DLL Name
@@ -65,7 +65,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""winrex.h""\r\n"
     "\r\n"
     "#ifndef NIFPLUGINS\r\n"
     "#define DLLNAME ""NifExporter.dle""  // DLL Name\r\n"
diff --git a/NifFurniture/NifFurniture.rc b/NifFurniture/NifFurniture.rc
index f26088c548a3d4be972b8ccddadf1d8792e64547..f5738d1eaf3e565a01d322d22ace0d9fdeb30db7 100755
--- a/NifFurniture/NifFurniture.rc
+++ b/NifFurniture/NifFurniture.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 #ifndef NIFPLUGINS
 #define DLLNAME "NifFurniture.dlu"  // DLL Name
@@ -66,7 +66,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""winres.h""\r\n"
     "\r\n"
     "#ifndef NIFPLUGINS\r\n"
     "#define DLLNAME ""NifFurniture.dlu""  // DLL Name\r\n"
diff --git a/NifImport/MaxNifImport.rc b/NifImport/MaxNifImport.rc
index 5c73c8c30d6ac0914db804b226928a1399da6ffa..2f548f6a82a5cbd664796405c5c9433a2439cfa3 100644
--- a/NifImport/MaxNifImport.rc
+++ b/NifImport/MaxNifImport.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 #ifndef NIFPLUGINS
 #define DLLNAME "NifImport.dlu"  // DLL Name
@@ -133,7 +133,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""winres.h""\r\n"
     "\r\n"
     "#ifndef NIFPLUGINS\r\n"
     "#define DLLNAME ""NifImport.dlu""  // DLL Name\r\n"
diff --git a/NifPlugins/NifPlugins.rc b/NifPlugins/NifPlugins.rc
index 57c6ae2ad8c7cc496c632f2d661c54e135f2fd0d..e7bc8015ec4f65d2488e3387aaad813f3e62e795 100644
--- a/NifPlugins/NifPlugins.rc
+++ b/NifPlugins/NifPlugins.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 #ifdef NIFPLUGINS
 #define DLLNAME "NifPlugins.dlu"  // DLL Name
@@ -40,7 +40,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""winres.h""\r\n"
     "\r\n"
     "#ifdef NIFPLUGINS\r\n"
     "#define DLLNAME ""NifPlugins.dlu""  // DLL Name\r\n"
diff --git a/NifProps/NifProps.rc b/NifProps/NifProps.rc
index 08abe009dd85c6a40b0dbde1f2099ba26b572f37..0ddb2b9804032b41b2903adadd15721e136329b9 100755
--- a/NifProps/NifProps.rc
+++ b/NifProps/NifProps.rc
@@ -7,13 +7,14 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 #ifndef NIFPLUGINS
 #define DLLNAME "NifProps.dlu"  // DLL Name
 #define DLLDESCRIPTION "3ds Max Nif Reactor Properites Plugin"
 #include "..\nifcommon\nifversion.rc"  
-#endif

+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -65,7 +66,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""winres.h""\r\n"
     "\r\n"
     "#ifndef NIFPLUGINS\r\n"
     "#define DLLNAME ""NifProps.dlu""  // DLL Name\r\n"
@@ -1151,7 +1152,8 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-

+
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
diff --git a/NifProps/bhkHelperFuncs.cpp b/NifProps/bhkHelperFuncs.cpp
index 9e7508e43a0c5f7aa882627ed8e3dae1a65e2db9..cc067465dc32eadb4c60ad0866c8bca7a06edfce 100644
--- a/NifProps/bhkHelperFuncs.cpp
+++ b/NifProps/bhkHelperFuncs.cpp
@@ -8,7 +8,7 @@
 #include "meshadj.h"
 
 // Includes for WildMagic so we can do the Capsule fitting
-#if defined(USES_WILDMAGIC)
+#if defined(USES_WILDMAGIC) && !defined(_M_X64)
 #  if _MSC_VER >= 1500
 #    ifdef _DEBUG
 #      pragma comment (lib, "Wm4Foundation90d")
@@ -784,7 +784,7 @@ void BuildScubaMesh(Mesh &mesh, int segs, int smooth, int llsegs,
 //   currently calculate then differently.
 extern void CalcCapsule(Mesh &mesh, Point3& pt1, Point3& pt2, float& r1, float& r2)
 {
-#if defined(USES_WILDMAGIC)
+#if defined(USES_WILDMAGIC) && !defined(_M_X64)
 	int nv = mesh.getNumVerts();
 	Wm4::Vector3<float>* akPoint = new Wm4::Vector3<float>[nv];
 	for (int i=0; i<nv; i++)
diff --git a/NifProps/bhkProxyObj.cpp b/NifProps/bhkProxyObj.cpp
index aebc6dd58073b77bf39a9cbc0b8aa58fe99f1aba..7cf1b8d33399ba5d3c6db24fba268563c673dfc7 100644
--- a/NifProps/bhkProxyObj.cpp
+++ b/NifProps/bhkProxyObj.cpp
@@ -365,7 +365,7 @@ INT_PTR ProxyParamDlgProc::DlgProc(TimeValue t,IParamMap2 *map,HWND hWnd,UINT ms
 		  so->pblock2->GetValue( PB_MATERIAL, 0, sel, valid);
 		  mCbMaterial.select( sel + 1 );
 		 // Disable all types not currently implemented
-#if defined(USES_WILDMAGIC)
+#if !defined(USES_WILDMAGIC) || defined(_M_X64)
 		 EnableWindow(GetDlgItem(hWnd, IDC_RDO_CAPSULE), FALSE);
 #endif
 		 //EnableWindow(GetDlgItem(hWnd, IDC_RDO_PACKED_STRIPS), FALSE);
diff --git a/NifProps/bhkRigidBodyModifer.cpp b/NifProps/bhkRigidBodyModifer.cpp
index f84bd4e2a2afaadeba7684bf0abbd5ee43d0ac77..fc0af9b82fc5778a3ac574674e13a6558b5a8c4f 100644
--- a/NifProps/bhkRigidBodyModifer.cpp
+++ b/NifProps/bhkRigidBodyModifer.cpp
@@ -269,9 +269,8 @@ INT_PTR bhkRigidBodyModifierDlgProc::DlgProc (TimeValue t,IParamMap2 *map,HWND h
 		   int sel = NP_INVALID_HVK_MATERIAL;
 		   mod->pblock->GetValue( PB_MATERIAL, 0, sel, valid);
 		   mCbMaterial.select( sel + 1 );
-
-#if defined(USES_WILDMAGIC)
-				EnableWindow(GetDlgItem(hWnd, IDC_RDO_CAPSULE), FALSE);
+#if !defined(USES_WILDMAGIC) || defined(_M_X64)
+		   EnableWindow(GetDlgItem(hWnd, IDC_RDO_CAPSULE), FALSE);
 #endif
 		   Update(t);
 		   break;