diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index d4b9673c8c475070a14144850f63f50866c59349..fce23b82713ea6c63d378d323448dca8bedc887f 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -14,7 +14,6 @@
 #if defined(HAVE_FLTK)
 #include <FL/gl.h>
 #include "FlGui.h"
-#include "drawContext.h"
 #include "graphicWindow.h"
 #include "gl2ps.h"
 #include "gl2gif.h"
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 61fa8ea8a154c9507661ba07464038a013fe33de..6db55cc2bcac00bc2dc9b7f37b43e99120b6cf33 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -10,7 +10,6 @@
 #include "GModel.h"
 #include "Numeric.h"
 #include "HighOrder.h"
-                      
 #include "Context.h"
 #include "OpenFile.h"
 #include "CommandLine.h"
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 0d2b68c093d49863acacd993e819b6c8a4169759..286a8b9600c4b98b139a43fa08a54d4dbd32d8ba 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -27,7 +27,6 @@
 
 #if defined(HAVE_FLTK)
 #include <FL/Fl_Tooltip.H>
-#include "drawContext.h"
 #include "FlGui.h"
 #include "Solvers.h"
 #include "menuWindow.h"
diff --git a/utils/api_demos/mainAntTweakBar.cpp b/utils/api_demos/mainAntTweakBar.cpp
index 3454d79d3dc7f8d63f5150147e7feb6a7904648c..0c6eb9b6542a6f5f03cab07c9e6be4012dbd8cd1 100644
--- a/utils/api_demos/mainAntTweakBar.cpp
+++ b/utils/api_demos/mainAntTweakBar.cpp
@@ -27,7 +27,8 @@ class drawContextTw : public drawContextGlobal{
   }
   int getStringHeight(){ return 18; }
   int getStringDescent(){ return 6; }
-  void drawString(const char *str){
+  void drawString(const char *str)
+  {
     for (int i = 0; i < strlen(str); i++) 
       glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str[i]); 
   }
diff --git a/utils/api_demos/mainGlut.cpp b/utils/api_demos/mainGlut.cpp
index 0894672103b2fee16b8a7266f9f2370719eba8ea..8fcaa5bc37c2907c324705f28d49004930cd0a7a 100644
--- a/utils/api_demos/mainGlut.cpp
+++ b/utils/api_demos/mainGlut.cpp
@@ -25,7 +25,8 @@ class drawContextGlut : public drawContextGlobal{
   }
   int getStringHeight(){ return 18; }
   int getStringDescent(){ return 6; }
-  void drawString(const char *str){
+  void drawString(const char *str)
+  {
     for (int i = 0; i < strlen(str); i++) 
       glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str[i]); 
   }