2 files changed, 2 insertions, 10 deletions
diff --git a/src/libnr/nr-point.h b/src/libnr/nr-point.h
index c1ec3adc9..c0810bda1 100644
--- a/src/libnr/nr-point.h
+++ b/src/libnr/nr-point.h
@@ -12,6 +12,7 @@
 
 #include <libnr/nr-coord.h>
 #include <libnr/nr-dim2.h>
+#include <libnr/nr-forward.h>
 
 //#include "round.h"
 #include "decimal-round.h"
@@ -20,8 +21,6 @@
 
 namespace NR {
 
-class Matrix;
-
 /// Cartesian point.
 class Point {
 public:
diff --git a/src/libnr/nr-types.h b/src/libnr/nr-types.h
index 4802f5e0c..bf499e7ff 100644
--- a/src/libnr/nr-types.h
+++ b/src/libnr/nr-types.h
@@ -24,14 +24,7 @@
 #include <libnr/nr-point-ops.h>
 #include <libnr/nr-rect.h>
 #include <libnr/nr-rect-l.h>
-
-namespace NR {
-
-class Rect;
-class Matrix;
-
-} /* namespace NR */
-
+#include <libnr/nr-forward.h>
 
 #endif /* !__NR_TYPES_H__ */