diff --git a/include/wx/affinematrix2d.h b/include/wx/affinematrix2d.h
index dfd4969614..cb94be4da1 100644
--- a/include/wx/affinematrix2d.h
+++ b/include/wx/affinematrix2d.h
@@ -10,6 +10,10 @@
 #ifndef _WX_AFFINEMATRIX2D_H_
 #define _WX_AFFINEMATRIX2D_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_GEOMETRY
+
 #include "wx/affinematrix2dbase.h"
 
 // A simple implementation of wxAffineMatrix2DBase interface done entirely in
@@ -42,4 +46,6 @@ private:
     wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;
 };
 
+#endif // wxUSE_GEOMETRY
+
 #endif // _WX_AFFINEMATRIX2D_H_
diff --git a/include/wx/affinematrix2dbase.h b/include/wx/affinematrix2dbase.h
index 9a70402e53..30b3256500 100644
--- a/include/wx/affinematrix2dbase.h
+++ b/include/wx/affinematrix2dbase.h
@@ -11,6 +11,9 @@
 #define _WX_AFFINEMATRIX2DBASE_H_
 
 #include "wx/defs.h"
+
+#if wxUSE_GEOMETRY
+
 #include "wx/geometry.h"
 
 struct wxMatrix2D
@@ -37,7 +40,7 @@ class WXDLLIMPEXP_CORE wxAffineMatrix2DBase
 public:
     wxAffineMatrix2DBase() {}
     virtual ~wxAffineMatrix2DBase() {}
-    
+
     // sets the matrix to the respective values
     virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0;
 
@@ -119,4 +122,6 @@ protected:
         wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const = 0;
 };
 
+#endif // wxUSE_GEOMETRY
+
 #endif // _WX_AFFINEMATRIX2DBASE_H_
diff --git a/src/common/affinematrix2d.cpp b/src/common/affinematrix2d.cpp
index 977f6834ad..b4605d4e53 100644
--- a/src/common/affinematrix2d.cpp
+++ b/src/common/affinematrix2d.cpp
@@ -13,6 +13,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_GEOMETRY
+
 #include "wx/affinematrix2d.h"
 #include "wx/math.h"
 
@@ -177,3 +179,5 @@ bool wxAffineMatrix2D::IsIdentity() const
            m_21 == 0 && m_22 == 1 &&
            m_tx == 0 && m_ty == 0;
 }
+
+#endif // wxUSE_GEOMETRY