diff --git a/include/goptical/core/analysis/PointImage b/include/goptical/core/analysis/PointImage
deleted file mode 100644
index a4645b0..0000000
--- a/include/goptical/core/analysis/PointImage
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#include "goptical/core/analysis/pointimage.hpp"
-#include "goptical/core/analysis/pointimage.hxx"
-
-namespace goptical {
-  namespace analysis {
-    using _goptical::analysis::PointImage;
-  }
-}
-
diff --git a/include/goptical/core/analysis/pointimage.hpp b/include/goptical/core/analysis/pointimage.hpp
index d8ae8a2..3d8eb57 100644
--- a/include/goptical/core/analysis/pointimage.hpp
+++ b/include/goptical/core/analysis/pointimage.hpp
@@ -75,8 +75,32 @@ namespace _goptical
     private:
     };
 
+    void PointImage::set_image(sys::Image *image)
+    {
+      _image = image;
+    }
+
+    trace::Tracer & PointImage::get_tracer()
+    {
+      invalidate();
+      return _tracer;
+    }
+
+    /** return tracer object used for ray tracing */
+    const trace::Tracer & PointImage::get_tracer() const
+    {
+      return _tracer;
+    }
+
   }
 }
 
+namespace goptical {
+  namespace analysis {
+    using _goptical::analysis::PointImage;
+  }
+}
+
+
 #endif
 
diff --git a/include/goptical/core/analysis/pointimage.hxx b/include/goptical/core/analysis/pointimage.hxx
deleted file mode 100644
index 960f3b6..0000000
--- a/include/goptical/core/analysis/pointimage.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-
-      This file is part of the <goptical/core Core library.
-  
-      The <goptical/core library is free software; you can redistribute it
-      and/or modify it under the terms of the GNU General Public
-      License as published by the Free Software Foundation; either
-      version 3 of the License, or (at your option) any later version.
-  
-      The <goptical/core library is distributed in the hope that it will be
-      useful, but WITHOUT ANY WARRANTY; without even the implied
-      warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-      See the GNU General Public License for more details.
-  
-      You should have received a copy of the GNU General Public
-      License along with the <goptical/core library; if not, write to the
-      Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-      Boston, MA 02111-1307 USA
-  
-      Copyright (C) 2010-2011 Free Software Foundation, Inc
-      Author: Alexandre Becoulet
-
-*/
-
-
-#ifndef GOPTICAL_ANALYSIS_POINTIMAGE_HXX_
-#define GOPTICAL_ANALYSIS_POINTIMAGE_HXX_
-
-#include "goptical/core/trace/tracer.hxx"
-#include "goptical/core/sys/system.hxx"
-
-namespace _goptical
-{
-
-  namespace analysis
-  {
-
-    void PointImage::set_image(sys::Image *image)
-    {
-      _image = image;
-    }
-
-    trace::Tracer & PointImage::get_tracer()
-    {
-      invalidate();
-      return _tracer;
-    }
-
-    /** return tracer object used for ray tracing */
-    const trace::Tracer & PointImage::get_tracer() const
-    {
-      return _tracer;
-    }
-
-  }
-
-}
-
-#endif
-
diff --git a/include/goptical/core/analysis/spot.hxx b/include/goptical/core/analysis/spot.hxx
index eb65196..f3e613a 100644
--- a/include/goptical/core/analysis/spot.hxx
+++ b/include/goptical/core/analysis/spot.hxx
@@ -30,7 +30,7 @@
 #include "goptical/core/math/vector.hxx"
 #include "goptical/core/data/plot.hxx"
 
-#include "goptical/core/analysis/pointimage.hxx"
+#include "goptical/core/analysis/pointimage.hpp"
 
   namespace _goptical
   {
diff --git a/src/core/analysis_pointimage.cpp b/src/core/analysis_pointimage.cpp
index b71c76d..8dce6c7 100644
--- a/src/core/analysis_pointimage.cpp
+++ b/src/core/analysis_pointimage.cpp
@@ -29,7 +29,8 @@
 #include <goptical/core/sys/Image>
 #include <goptical/core/sys/Surface>
 
-#include <goptical/core/analysis/PointImage>
+#include <goptical/core/analysis/pointimage.hpp>
+#include "goptical/core/sys/system.hxx"
 
 namespace _goptical
 {