*** empty log message ***

7 files changed, 8 insertions, 28 deletions

diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index a8e8d85..4e314e8 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -27,15 +27,8 @@
  *	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-extern "C" {
-#include "bltInt.h"
-#include "bltGraph.h"
-#include "bltOp.h"
-};
-
-#include "bltGrElemOp.h"
 #include "bltGrElem.h"
-#include "bltGrPen.h"
+#include "bltGrElemOp.h"
 #include "bltGrPenOp.h"
 
 PenStyle** Blt_StyleMap(Element* elemPtr)
diff --git a/src/bltGrElem.h b/src/bltGrElem.h
index 8d0c26f..e3fa85f 100644
--- a/src/bltGrElem.h
+++ b/src/bltGrElem.h
@@ -36,7 +36,8 @@
 using namespace std;
 
 extern "C" {
-#include <bltVector.h>
+#include "bltGraph.h"
+#include "bltVector.h"
 };
 
 #include "bltGrPen.h"
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index e187549..6b219ca 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -29,12 +29,9 @@
 
 #include "bltMath.h"
 
-extern "C" {
-#include "bltGraph.h"
-};
-
 #include "bltGrElemBar.h"
 #include "bltGrElemOption.h"
+#include "bltGrPenOp.h"
 
 #define CLAMP(x,l,h)	((x) = (((x)<(l))? (l) : ((x)>(h)) ? (h) : (x)))
 
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 2755286..15f3cf0 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -30,12 +30,12 @@
 #include "bltMath.h"
 
 extern "C" {
-#include "bltGraph.h"
 #include "bltSpline.h"
 }
 
 #include "bltGrElemLine.h"
 #include "bltGrElemOption.h"
+#include "bltGrPenOp.h"
 
 #define SEARCH_X	0
 #define SEARCH_Y	1
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C
index 19a6654..931a5b7 100644
--- a/src/bltGrElemOption.C
+++ b/src/bltGrElemOption.C
@@ -27,10 +27,6 @@
  *	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-extern "C" {
-#include "bltGraph.h"
-};
-
 #include "bltGrElem.h"
 #include "bltGrElemOption.h"
 
diff --git a/src/bltGrPen.h b/src/bltGrPen.h
index a17b588..9209edd 100644
--- a/src/bltGrPen.h
+++ b/src/bltGrPen.h
@@ -35,9 +35,11 @@
 #include <iomanip>
 using namespace std;
 
+extern "C" {
+#include "bltGraph.h"
+};
 
 typedef struct _Pen Pen;
-#include "bltGrPenOp.h"
 
 typedef Pen* (PenCreateProc)(void);
 typedef int (PenConfigureProc)(Graph* graphPtr, Pen* penPtr);
diff --git a/src/bltGrPenOp.h b/src/bltGrPenOp.h
index f927cea..18047b7 100644
--- a/src/bltGrPenOp.h
+++ b/src/bltGrPenOp.h
@@ -30,15 +30,6 @@
 #ifndef __bltgrpenop_h__
 #define __bltgrpenop_h__
 
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
 extern void Blt_FreePen(Pen* penPtr);
 
-extern "C" {
-#include "bltGraph.h"
-};
-
 #endif