6 files changed, 14 insertions, 4 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 207fe01..594d0bd 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -33,6 +33,7 @@ extern "C" {
 #include "bltInt.h"
 }
 
+#include "bltGraph.h"
 #include "bltGrAxis.h"
 #include "bltGrAxisOption.h"
 #include "bltGrMisc.h"
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index f0c3d84..5980770 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -40,10 +40,15 @@ using namespace std;
 
 extern "C" {
 #include "bltBind.h"
+#include "bltChain.h"
 };
 
-#include "bltGraph.h"
+class Graph;
+class PageSetup;
+
 #include "bltGrMisc.h"
+#include "bltText.h"
+#include "bltPs.h"
 
 typedef struct {
   int axis;
diff --git a/src/bltGrAxisOption.C b/src/bltGrAxisOption.C
index ea6f537..027c6e0 100644
--- a/src/bltGrAxisOption.C
+++ b/src/bltGrAxisOption.C
@@ -31,6 +31,7 @@ extern "C" {
 #include "bltInt.h"
 };
 
+#include "bltGraph.h"
 #include "bltGrAxis.h"
 #include "bltGrAxisOption.h"
 #include "bltConfig.h"
diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index d57f13f..498b4ff 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -29,6 +29,7 @@
 
 #include "bltGrElem.h"
 #include "bltGrElemOp.h"
+#include "bltGrPen.h"
 #include "bltGrPenOp.h"
 
 using namespace Blt;
diff --git a/src/bltGrElem.h b/src/bltGrElem.h
index 4e509f4..3500a74 100644
--- a/src/bltGrElem.h
+++ b/src/bltGrElem.h
@@ -39,8 +39,8 @@ extern "C" {
 #include "bltVector.h"
 };
 
-#include "bltGraph.h"
-#include "bltGrPen.h"
+#include "bltGrMisc.h"
+#include "bltGraph.h" // for Axis2d
 
 #define SHOW_NONE	0
 #define SHOW_X		1
@@ -57,6 +57,7 @@ extern "C" {
 		       (e)->builtinPenPtr : (e)->normalPenPtr))
 
 class Element;
+class Pen;
 
 typedef struct {
   Segment2d *segments;
@@ -113,7 +114,7 @@ typedef struct {
   Pen* builtinPenPtr;
   Pen* activePenPtr;
   Pen* normalPenPtr;
-  PenOptions builtinPen;
+  void* builtinPen;
 } ElementOptions;
 
 class Element {
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C
index b8f0518..2df1ead 100644
--- a/src/bltGrElemOption.C
+++ b/src/bltGrElemOption.C
@@ -34,6 +34,7 @@ extern "C" {
 
 #include "bltGrElem.h"
 #include "bltGrElemOption.h"
+#include "bltGrPen.h"
 #include "bltGrPenOp.h"
 #include "bltConfig.h"