8 files changed, 24 insertions, 27 deletions
diff --git a/source/blender/python/generic/bgl.h b/source/blender/python/generic/bgl.h
index 60cca8e8ec7..049b3f101a0 100644
--- a/source/blender/python/generic/bgl.h
+++ b/source/blender/python/generic/bgl.h
@@ -33,8 +33,8 @@
  * writers to make OpenGL calls in their Python scripts for Blender.  The
  * more important original comments are marked with an @ symbol. */
 
-#ifndef EXPP_BGL_H
-#define EXPP_BGL_H
+#ifndef BGL_H
+#define BGL_H
 
 #include <Python.h>
 
@@ -337,4 +337,4 @@ extern PyTypeObject BGL_bufferType;
 		return NULL;\
 	}
 
-#endif  /*  EXPP_BGL_H */
+#endif /* BGL_H */
diff --git a/source/blender/python/generic/mathutils.h b/source/blender/python/generic/mathutils.h
index 22f1536bb10..29ef52c77b0 100644
--- a/source/blender/python/generic/mathutils.h
+++ b/source/blender/python/generic/mathutils.h
@@ -28,8 +28,8 @@
 */
 //Include this file for access to vector, quat, matrix, euler, etc...
 
-#ifndef EXPP_Mathutils_H
-#define EXPP_Mathutils_H
+#ifndef MATHUTILS_H
+#define MATHUTILS_H
 
 #include <Python.h>
 
@@ -66,9 +66,6 @@ PyMODINIT_FUNC BPyInit_mathutils(void);
 int EXPP_FloatsAreEqual(float A, float B, int floatSteps);
 int EXPP_VectorsAreEqual(float *vecA, float *vecB, int size, int floatSteps);
 
-
-#define Py_PI  3.14159265358979323846
-
 #define Py_NEW  1
 #define Py_WRAP 2
 
@@ -104,4 +101,4 @@ int _BaseMathObject_WriteIndexCallback(BaseMathObject *self, int index);
 /* utility func */
 int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix);
 
-#endif				/* EXPP_Mathutils_H */
+#endif /* MATHUTILS_H */
diff --git a/source/blender/python/generic/mathutils_color.h b/source/blender/python/generic/mathutils_color.h
index 02b27d86817..f3f185b2991 100644
--- a/source/blender/python/generic/mathutils_color.h
+++ b/source/blender/python/generic/mathutils_color.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef EXPP_color_h
-#define EXPP_color_h
+#ifndef MATHUTILS_COLOR_H
+#define MATHUTILS_COLOR_H
 
 #include <Python.h>
 
@@ -49,4 +49,4 @@ blender (stored in blend_data). This is an either/or struct not both*/
 PyObject *newColorObject( float *col, int type, PyTypeObject *base_type);
 PyObject *newColorObject_cb(PyObject *cb_user, int cb_type, int cb_subtype);
 
-#endif				/* EXPP_color_h */
+#endif /* MATHUTILS_COLOR_H */
diff --git a/source/blender/python/generic/mathutils_euler.h b/source/blender/python/generic/mathutils_euler.h
index b8523c3b661..fc4e4ddb667 100644
--- a/source/blender/python/generic/mathutils_euler.h
+++ b/source/blender/python/generic/mathutils_euler.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef EXPP_euler_h
-#define EXPP_euler_h
+#ifndef MATHUTILS_EULER_H
+#define MATHUTILS_EULER_H
 
 #include <Python.h>
 
@@ -54,4 +54,4 @@ PyObject *newEulerObject_cb(PyObject *cb_user, short order, int cb_type, int cb_
 short euler_order_from_string(const char *str, const char *error_prefix);
 
 
-#endif				/* EXPP_euler_h */
+#endif /* MATHUTILS_EULER_H */
diff --git a/source/blender/python/generic/mathutils_geometry.h b/source/blender/python/generic/mathutils_geometry.h
index 3d3f7c606a4..27c24848efe 100644
--- a/source/blender/python/generic/mathutils_geometry.h
+++ b/source/blender/python/generic/mathutils_geometry.h
@@ -28,12 +28,12 @@
 */
 /*Include this file for access to vector, quat, matrix, euler, etc...*/
 
-#ifndef EXPP_Geometry_H
-#define EXPP_Geometry_H
+#ifndef MATHUTILS_GEOMETRY_H
+#define MATHUTILS_GEOMETRY_H
 
 #include <Python.h>
 #include "mathutils.h"
 
 PyMODINIT_FUNC BPyInit_mathutils_geometry(void);
 
-#endif				/* EXPP_Geometry_H */
+#endif /* MATHUTILS_GEOMETRY_H */
diff --git a/source/blender/python/generic/mathutils_matrix.h b/source/blender/python/generic/mathutils_matrix.h
index 863cfeb5e05..4d477818171 100644
--- a/source/blender/python/generic/mathutils_matrix.h
+++ b/source/blender/python/generic/mathutils_matrix.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef EXPP_matrix_h
-#define EXPP_matrix_h
+#ifndef MATHUTILS_MATRIX_H
+#define MATHUTILS_MATRIX_H
 
 #include <Python.h>
 
@@ -55,4 +55,4 @@ PyObject *newMatrixObject_cb(PyObject *user, int rowSize, int colSize, int cb_ty
 extern int mathutils_matrix_vector_cb_index;
 extern struct Mathutils_Callback mathutils_matrix_vector_cb;
 
-#endif				/* EXPP_matrix_H */
+#endif /* MATHUTILS_MATRIX_H */
diff --git a/source/blender/python/generic/mathutils_quat.h b/source/blender/python/generic/mathutils_quat.h
index c9ec12d6152..cfa82f20d42 100644
--- a/source/blender/python/generic/mathutils_quat.h
+++ b/source/blender/python/generic/mathutils_quat.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef EXPP_quat_h
-#define EXPP_quat_h
+#ifndef MATHUTILS_QUAT_H
+#define MATHUTILS_QUAT_H
 
 #include <Python.h>
 
@@ -49,4 +49,4 @@ blender (stored in blend_data). This is an either/or struct not both*/
 PyObject *newQuaternionObject( float *quat, int type, PyTypeObject *base_type);
 PyObject *newQuaternionObject_cb(PyObject *cb_user, int cb_type, int cb_subtype);
 
-#endif				/* EXPP_quat_h */
+#endif /* MATHUTILS_QUAT_H */
diff --git a/source/blender/python/generic/mathutils_vector.h b/source/blender/python/generic/mathutils_vector.h
index 42b9849dd3f..e5d15dbfdb0 100644
--- a/source/blender/python/generic/mathutils_vector.h
+++ b/source/blender/python/generic/mathutils_vector.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef EXPP_vector_h
-#define EXPP_vector_h
+#ifndef MATHUTILS_VECTOR_H
+#define MATHUTILS_VECTOR_H
 
 #include <Python.h>
 
@@ -46,4 +46,4 @@ typedef struct {
 PyObject *newVectorObject(float *vec, int size, int type, PyTypeObject *base_type);
 PyObject *newVectorObject_cb(PyObject *user, int size, int callback_type, int subtype);
 
-#endif				/* EXPP_vector_h */
+#endif				/* MATHUTILS_VECTOR_H */