hopefully fixes building on msvc, also some minor header edits

source/blender/python/intern/bpy.c

@@ -32,6 +32,9 @@
 
 #include <Python.h>
 
+#include "RNA_types.h"
+#include "RNA_access.h"
+
 #include "bpy.h" 
 #include "bpy_util.h" 
 #include "bpy_rna.h"
@@ -49,8 +52,6 @@
 #include "BKE_global.h" /* XXX, G.main only */
 #include "BKE_blender.h"
 
-#include "RNA_access.h"
-
 #include "MEM_guardedalloc.h"
 
 /* external util modules */

source/blender/python/intern/bpy_util.h

@@ -24,7 +24,6 @@
  *  \ingroup pythonintern
  */
 
-
 #ifndef __BPY_UTIL_H__
 #define __BPY_UTIL_H__
 
@@ -33,11 +32,12 @@
 #endif
 
 #if PY_VERSION_HEX <  0x03030000
+#  ifdef _MSC_VER
+#    pragma message("Python 3.2 will be deprecated soon, upgrade to Python 3.3.")
+#  else
 #    warning "Python 3.2 will be deprecated soon, upgrade to Python 3.3."
 #  endif
-
-
-#include "RNA_types.h" /* for EnumPropertyItem only */
+#endif
 
 struct EnumPropertyItem;
 struct ReportList;
@@ -56,4 +56,5 @@ void BPy_SetContext(struct bContext *C);
 
 extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate);
 extern void bpy_context_clear(struct bContext *C, PyGILState_STATE *gilstate);
-#endif
+
+#endif  /* __BPY_UTIL_H__ */