make code compile on Mac again

Plugin/StructuralSolver.cpp

@@ -5,17 +5,9 @@
 #include "Utils.h"
 #include "Numeric.h"
 
-#if defined(HAVE_FLTK)
-#include <FL/Fl.H>
-#include <FL/filename.H>
-#include <FL/Fl_PNG_Image.H>
-#include "GL/glu.h"
-#endif
-
 extern Mesh *THEM;
 extern Context_T CTX;
 
-
 extern "C"
 {
   GMSH_Plugin *GMSH_RegisterStructuralSolverPlugin()
@@ -97,7 +89,6 @@ void Structural_Texture::setup ()
   
   Fl_PNG_Image image(filename.c_str());
 
-  int width, height;
   // allocate a texture name
   glGenTextures( 1, &tag );
   
@@ -143,7 +134,6 @@ void Structural_BeamSection ::  GL_DrawBeam (double pinit[3], double dir[3], con
   double X[3] = {dir[0],dir[1],dir[2]};
   double Z[3] = {dirz[0],dirz[1],dirz[2]};
   double Y[3];
-  double nn = norme(X);
   prodve(X,Z,Y);
   double transl[3] = {pinit[0]-xc,pinit[1]-yc,pinit[2]};
   double rot[3][3] = {{Z[0],Y[0],X[0]},
@@ -387,6 +377,7 @@ Structural_BeamSection * StructuralSolver :: GetBeamSection (const std::string &
       if ((*it)->name == name)
 	return *it;
     }
+  return 0;
 }
 
 
@@ -862,7 +853,6 @@ bool StructuralSolver :: GL_enhanceLine ( int CurveId, Vertex *v1, Vertex *v2)
   PhysicalGroup *p;
   for(int i = 0; i < List_Nbr(THEM->PhysicalGroups); i++) 
     { 
-      char Num[100];
       List_Read(THEM->PhysicalGroups, i, &p);
       if(p->Typ == MSH_PHYSICAL_LINE) {
 	if(List_Search(p->Entities, &CurveId, fcmp_absint)) { 

Plugin/StructuralSolver.h

@@ -28,33 +28,13 @@
 #include <string>
 
 #ifdef HAVE_FLTK
+#include "GmshUI.h"
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Menu_Bar.H>
-#include <FL/fl_draw.H>
-#include <FL/gl.h>
 #include <FL/Fl_Choice.H>
-#include <FL/Fl_Scroll.H>
-#include <FL/Fl_Tabs.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Return_Button.H>
-#include <FL/Fl_Repeat_Button.H>
-#include <FL/Fl_Light_Button.H>
-#include <FL/Fl_Menu_Button.H>
-#include <FL/Fl_Check_Button.H>
-#include <FL/Fl_Input.H>
 #include <FL/Fl_Value_Input.H>
-#include <FL/Fl_Output.H>
-#include <FL/Fl_Multiline_Output.H>
-#include <FL/Fl_Bitmap.H>
-#include <FL/Fl_Browser.H>
-#include <FL/Fl_Multi_Browser.H>
-#include <FL/Fl_Hold_Browser.H>
-#include <FL/x.H>
-#include <FL/Fl_Color_Chooser.H>
-#include <FL/fl_ask.H>
-#include <FL/Fl_Tooltip.H>
-#include <GL/glu.h>
+#include <FL/Fl_Tabs.H>
+#include <FL/filename.H>
+#include <FL/Fl_PNG_Image.H>
 #endif
 
 extern "C"