diff --git a/geometry/packer.hpp b/geometry/packer.hpp
index a8de1de8f7..e768913974 100644
--- a/geometry/packer.hpp
+++ b/geometry/packer.hpp
@@ -1,5 +1,3 @@
-#ifndef PACKER_H
-#define PACKER_H
 #pragma once
 
 #include "rect2d.hpp"
@@ -92,4 +90,3 @@ namespace m2
     uint32_t invalidHandle() const;
   };
 }
-#endif // PACKER_H
diff --git a/indexer/indexer_tests/cell_covering_visualize_test.cpp b/indexer/indexer_tests/cell_covering_visualize_test.cpp
index 924161eeac..54e2029aed 100644
--- a/indexer/indexer_tests/cell_covering_visualize_test.cpp
+++ b/indexer/indexer_tests/cell_covering_visualize_test.cpp
@@ -4,8 +4,11 @@
 
 #include "../../qt_tstfrm/main_tester.hpp"
 #include "../../qt_tstfrm/tstwidgets.hpp"
+
 #include "../../yg/screen.hpp"
 #include "../../yg/skin.hpp"
+#include "../../yg/pen_info.hpp"
+
 #include "../../geometry/screenbase.hpp"
 
 #include "../../testing/testing.hpp"
diff --git a/map/drawer_yg.cpp b/map/drawer_yg.cpp
index 677bb8c55d..95a2281541 100644
--- a/map/drawer_yg.cpp
+++ b/map/drawer_yg.cpp
@@ -7,6 +7,8 @@
 #include "../yg/screen.hpp"
 #include "../yg/skin.hpp"
 #include "../yg/resource_manager.hpp"
+#include "../yg/circle_info.hpp"
+#include "../yg/pen_info.hpp"
 
 #include "../geometry/screenbase.hpp"
 
@@ -14,10 +16,6 @@
 #include "../base/logging.hpp"
 #include "../base/buffer_vector.hpp"
 
-#include "../std/sstream.hpp"
-
-#include "../base/start_mem_debug.hpp"
-
 DrawerYG::Params::Params()
   : m_dynamicPagesCount(2),
     m_textPagesCount(2)
diff --git a/map/information_display.cpp b/map/information_display.cpp
index a9e7325bc8..b066ff7d98 100644
--- a/map/information_display.cpp
+++ b/map/information_display.cpp
@@ -1,19 +1,20 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "information_display.hpp"
 #include "drawer_yg.hpp"
 
 #include "../indexer/mercator.hpp"
 #include "../yg/defines.hpp"
 #include "../yg/skin.hpp"
+#include "../yg/pen_info.hpp"
 
-#include "../std/fstream.hpp"
-#include "../std/iomanip.hpp"
 #include "../version/version.hpp"
 
 #include "../base/string_utils.hpp"
 #include "../base/logging.hpp"
 #include "../base/mutex.hpp"
+#include "../base/macros.hpp"
+
+#include "../std/fstream.hpp"
+#include "../std/iomanip.hpp"
 
 InformationDisplay::InformationDisplay()
 {
diff --git a/map/render_queue_routine.cpp b/map/render_queue_routine.cpp
index e673a8948c..7266330fd8 100644
--- a/map/render_queue_routine.cpp
+++ b/map/render_queue_routine.cpp
@@ -1,4 +1,3 @@
-#include "../base/SRC_FIRST.hpp"
 #include "../base/mutex.hpp"
 #include "../base/timer.hpp"
 #include "../base/logging.hpp"
@@ -10,11 +9,11 @@
 #include "../yg/rendercontext.hpp"
 #include "../yg/framebuffer.hpp"
 #include "../yg/renderbuffer.hpp"
-#include "../yg/texture.hpp"
 #include "../yg/resource_manager.hpp"
 #include "../yg/screen.hpp"
 #include "../yg/pen_info.hpp"
 #include "../yg/skin.hpp"
+#include "../yg/base_texture.hpp"
 
 #include "../indexer/scales.hpp"
 
@@ -22,6 +21,7 @@
 #include "drawer_yg.hpp"
 #include "window_handle.hpp"
 #include "render_queue_routine.hpp"
+
 RenderQueueRoutine::RenderModelCommand::RenderModelCommand(ScreenBase const & frameScreen,
                                                              render_fn_t renderFn)
                                                                : m_frameScreen(frameScreen),
diff --git a/qt/widgets.cpp b/qt/widgets.cpp
index 58a84690f8..06e4d765bb 100644
--- a/qt/widgets.cpp
+++ b/qt/widgets.cpp
@@ -7,14 +7,12 @@
 #include "../platform/platform.hpp"
 
 #include "../yg/rendercontext.hpp"
+#include "../yg/internal/opengl.hpp"
 
 #ifdef OMIM_OS_WINDOWS
-#include "../yg/internal/opengl_win32.hpp"
+  #include "../yg/internal/opengl_win32.hpp"
 #endif
 
-#include "../base/start_mem_debug.hpp"
-
-
 namespace qt
 {
   template class GLDrawWidgetT<DrawerYG>;
diff --git a/qt/widgets.hpp b/qt/widgets.hpp
index 2219fb202e..c2fe9cccd6 100644
--- a/qt/widgets.hpp
+++ b/qt/widgets.hpp
@@ -2,8 +2,6 @@
 
 #include "../qt_tstfrm/widgets.hpp"
 #include "../map/qgl_render_context.hpp"
-#include "../yg/texture.hpp"
-#include "../base/start_mem_debug.hpp"
 #include "../yg/resource_manager.hpp"
 
 class DrawerYG;
@@ -43,5 +41,3 @@ namespace qt
     virtual void initializeGL();
   };
 }
-
-#include "../base/stop_mem_debug.hpp"
diff --git a/qt_tstfrm/widgets.hpp b/qt_tstfrm/widgets.hpp
index 5b331fd2f9..7456d82d69 100644
--- a/qt_tstfrm/widgets.hpp
+++ b/qt_tstfrm/widgets.hpp
@@ -1,14 +1,11 @@
 #pragma once
 
-#include <QtGui/QWidget>
-
 #include <QtOpenGL/qgl.h>
 
-#include "../base/start_mem_debug.hpp"
-#include "../std/shared_ptr.hpp"
-#include "../yg/screen.hpp"
 #include "../map/drawer_yg.hpp"
 
+#include "../std/shared_ptr.hpp"
+
 namespace qt
 {
   template <class TScreen, class TBase> class BaseDrawWidget : public TBase
@@ -54,5 +51,3 @@ namespace qt
     //@}
   };
 }
-
-#include "../base/stop_mem_debug.hpp"
diff --git a/qt_tstfrm/widgets_impl.hpp b/qt_tstfrm/widgets_impl.hpp
index 5cbd0a49ef..00612904cc 100644
--- a/qt_tstfrm/widgets_impl.hpp
+++ b/qt_tstfrm/widgets_impl.hpp
@@ -2,8 +2,6 @@
 
 #include "widgets.hpp"
 
-#include "../base/start_mem_debug.hpp"
-
 namespace qt
 {
   template <class T>
diff --git a/yg/area_renderer.cpp b/yg/area_renderer.cpp
index 0c3a8b87cf..80b006c9c1 100644
--- a/yg/area_renderer.cpp
+++ b/yg/area_renderer.cpp
@@ -1,6 +1,9 @@
 #include "area_renderer.hpp"
 #include "resource_style.hpp"
 #include "skin.hpp"
+#include "skin_page.hpp"
+#include "base_texture.hpp"
+
 #include "../base/logging.hpp"
 
 namespace yg
diff --git a/yg/blitter.cpp b/yg/blitter.cpp
index 65eea88d75..ad1dc40f34 100644
--- a/yg/blitter.cpp
+++ b/yg/blitter.cpp
@@ -3,13 +3,13 @@
 #include "blitter.hpp"
 #include "framebuffer.hpp"
 #include "base_texture.hpp"
-#include "texture.hpp"
 #include "resource_manager.hpp"
 #include "vertexbuffer.hpp"
 #include "indexbuffer.hpp"
 #include "utils.hpp"
 #include "storage.hpp"
 #include "vertex.hpp"
+#include "texture.hpp"
 
 #include "../geometry/screenbase.hpp"
 
diff --git a/yg/blitter.hpp b/yg/blitter.hpp
index f97b93fad0..9dc26bb230 100644
--- a/yg/blitter.hpp
+++ b/yg/blitter.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "color.hpp"
 #include "clipper.hpp"
 #include "storage.hpp"
 #include "../std/shared_ptr.hpp"
@@ -11,6 +10,8 @@ class ScreenBase;
 
 namespace yg
 {
+  struct Color;
+
   namespace gl
   {
     class BaseTexture;
diff --git a/yg/color.hpp b/yg/color.hpp
index a66a918903..c1ead3d778 100644
--- a/yg/color.hpp
+++ b/yg/color.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../base/base.hpp"
+#include "../std/stdint.hpp"
 
 namespace yg
 {
@@ -27,8 +27,8 @@ namespace yg
   bool operator !=(Color const & l, Color const & r);
   bool operator ==(Color const & l, Color const & r);
 
-  inline int redFromARGB(uint32_t c)   {return (c >> 16) & 0xFF;};
-  inline int greenFromARGB(uint32_t c) {return (c >> 8) & 0xFF;};
-  inline int blueFromARGB(uint32_t c)  {return (c & 0xFF);};
-  inline int alphaFromARGB(uint32_t c)  {return (c >> 24) & 0xFF;};
+  inline int redFromARGB(uint32_t c)   {return (c >> 16) & 0xFF;}
+  inline int greenFromARGB(uint32_t c) {return (c >> 8) & 0xFF; }
+  inline int blueFromARGB(uint32_t c)  {return (c & 0xFF);      }
+  inline int alphaFromARGB(uint32_t c) {return (c >> 24) & 0xFF;}
 }
diff --git a/yg/geometry_batcher.cpp b/yg/geometry_batcher.cpp
index 40d034266f..ced5df5e7f 100644
--- a/yg/geometry_batcher.cpp
+++ b/yg/geometry_batcher.cpp
@@ -1,11 +1,11 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "geometry_batcher.hpp"
 #include "skin.hpp"
 #include "memento.hpp"
 #include "color.hpp"
 #include "utils.hpp"
 #include "resource_manager.hpp"
+#include "skin_page.hpp"
+#include "base_texture.hpp"
 
 #include "internal/opengl.hpp"
 
@@ -20,8 +20,6 @@
 #include "../std/algorithm.hpp"
 #include "../std/bind.hpp"
 
-#include "../base/start_mem_debug.hpp"
-
 namespace yg
 {
   namespace gl
diff --git a/yg/geometry_batcher.hpp b/yg/geometry_batcher.hpp
index 0efe2e2f20..0f9de907dc 100644
--- a/yg/geometry_batcher.hpp
+++ b/yg/geometry_batcher.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "vertex.hpp"
-#include "texture.hpp"
 #include "vertexbuffer.hpp"
 #include "indexbuffer.hpp"
 #include "renderbuffer.hpp"
@@ -15,7 +14,6 @@
 #include "../std/function.hpp"
 
 #include "../base/matrix.hpp"
-#include "../base/start_mem_debug.hpp"
 
 namespace threads
 {
@@ -173,5 +171,3 @@ namespace yg
     };
   }
 }
-
-#include "../base/stop_mem_debug.hpp"
diff --git a/yg/glyph_layout.cpp b/yg/glyph_layout.cpp
index 2321ac6ba2..8d5fbc255c 100644
--- a/yg/glyph_layout.cpp
+++ b/yg/glyph_layout.cpp
@@ -292,8 +292,9 @@ namespace yg
             break;
         }
         if (i == 100)
+        {
           LOG(LINFO, ("100 iteration on computing kerning exceeded. possibly infinite loop occured"));
-
+        }
 
         /// kerning should be computed for baseline centered glyph
         prevElem = m_entries[symPos];
diff --git a/yg/gpu_state.hpp b/yg/gpu_state.hpp
index 5f4518c46f..f51c638183 100644
--- a/yg/gpu_state.hpp
+++ b/yg/gpu_state.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <internal/opengl.hpp>
+#include "internal/opengl.hpp"
 
 namespace yg
 {
diff --git a/yg/layer_manager.hpp b/yg/layer_manager.hpp
index ce9d894c63..07a8a2acb1 100644
--- a/yg/layer_manager.hpp
+++ b/yg/layer_manager.hpp
@@ -2,13 +2,16 @@
 
 #include "renderer.hpp"
 
+#include "../geometry/point2d.hpp"
+
 #include "../std/vector.hpp"
-#include "base_texture.hpp"
 
 namespace yg
 {
   namespace gl
   {
+    class BaseTexture;
+
     /// all the layers are combined by a simple blitting
     /// at the endFrame/updateActualTarget.
     class LayerManager : public Renderer
diff --git a/yg/memento.hpp b/yg/memento.hpp
index e5ad87357d..a33c30be6a 100644
--- a/yg/memento.hpp
+++ b/yg/memento.hpp
@@ -1,5 +1,4 @@
-#ifndef MEMENTO_H
-#define MEMENTO_H
+#pragma once
 
 namespace yg
 {
@@ -41,5 +40,3 @@ namespace yg
 
   }
 }
-
-#endif // MEMENTO_H
diff --git a/yg/path_renderer.cpp b/yg/path_renderer.cpp
index 383e0d1544..6ffcf01401 100644
--- a/yg/path_renderer.cpp
+++ b/yg/path_renderer.cpp
@@ -1,8 +1,8 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "path_renderer.hpp"
 #include "resource_style.hpp"
 #include "skin.hpp"
+#include "skin_page.hpp"
+#include "base_texture.hpp"
 
 #include "../base/logging.hpp"
 
diff --git a/yg/pbuffer_texture.hpp b/yg/pbuffer_texture.hpp
deleted file mode 100644
index ef3cae5cce..0000000000
--- a/yg/pbuffer_texture.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-namespace yg
-{
-  namespace gl
-  {
-    class PBufferTexture
-    {
-
-    };
-  }
-}
diff --git a/yg/pen_info.hpp b/yg/pen_info.hpp
index d3b8cb4d38..4ede787adb 100644
--- a/yg/pen_info.hpp
+++ b/yg/pen_info.hpp
@@ -3,7 +3,7 @@
 #include "color.hpp"
 
 #include "../geometry/point2d.hpp"
-#include "../std/vector.hpp"
+
 #include "../base/buffer_vector.hpp"
 
 namespace yg
diff --git a/yg/render_state.hpp b/yg/render_state.hpp
index f56ddebcad..d2bd1bc8ff 100644
--- a/yg/render_state.hpp
+++ b/yg/render_state.hpp
@@ -1,16 +1,18 @@
 #pragma once
 
+#include "../geometry/screenbase.hpp"
+
 #include "../base/mutex.hpp"
+
 #include "../std/function.hpp"
 #include "../std/list.hpp"
 #include "../std/shared_ptr.hpp"
-#include "../geometry/screenbase.hpp"
-#include "texture.hpp"
 
 namespace yg
 {
   namespace gl
   {
+    class BaseTexture;
     class RenderBuffer;
 
     class RenderState
diff --git a/yg/render_state_updater.cpp b/yg/render_state_updater.cpp
index 6a84cf02ea..def84de159 100644
--- a/yg/render_state_updater.cpp
+++ b/yg/render_state_updater.cpp
@@ -1,8 +1,8 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "render_state_updater.hpp"
 #include "render_state.hpp"
 #include "framebuffer.hpp"
+#include "internal/opengl.hpp"
+#include "base_texture.hpp"
 
 #include "../base/logging.hpp"
 
diff --git a/yg/render_state_updater.hpp b/yg/render_state_updater.hpp
index b261c50140..fa3889784d 100644
--- a/yg/render_state_updater.hpp
+++ b/yg/render_state_updater.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../std/shared_ptr.hpp"
-#include "../geometry/screenbase.hpp"
 #include "../base/timer.hpp"
 
 #include "geometry_renderer.hpp"
diff --git a/yg/render_target.hpp b/yg/render_target.hpp
index 37b2d91772..8e6c4d8c90 100644
--- a/yg/render_target.hpp
+++ b/yg/render_target.hpp
@@ -7,7 +7,7 @@ namespace yg
     class RenderTarget
     {
     public:
-      virtual ~RenderTarget(){};
+      virtual ~RenderTarget() {}
       /// attach render target to framebuffer and setup coordinate system
       virtual void attachToFrameBuffer() = 0;
       virtual unsigned  width() const = 0;
diff --git a/yg/renderer.hpp b/yg/renderer.hpp
index d2661bc888..4a6a480042 100644
--- a/yg/renderer.hpp
+++ b/yg/renderer.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../std/shared_ptr.hpp"
-#include "texture.hpp"
 #include "color.hpp"
 
+#include "../std/shared_ptr.hpp"
+
 namespace yg
 {
   class ResourceManager;
@@ -12,6 +12,8 @@ namespace yg
   {
     class FrameBuffer;
     class RenderBuffer;
+    class BaseTexture;
+    class RenderTarget;
 
     class Renderer
     {
diff --git a/yg/resource_manager.cpp b/yg/resource_manager.cpp
index 3bbda54165..a857b568fc 100644
--- a/yg/resource_manager.cpp
+++ b/yg/resource_manager.cpp
@@ -1,22 +1,24 @@
-#include "../base/SRC_FIRST.hpp"
 #include "internal/opengl.hpp"
 #include "base_texture.hpp"
 #include "data_formats.hpp"
 #include "resource_manager.hpp"
 #include "skin_loader.hpp"
-#include "texture.hpp"
 #include "storage.hpp"
+#include "texture.hpp"
 
 #include "../coding/file_reader.hpp"
 #include "../coding/parse_xml.hpp"
-#include "../base/logging.hpp"
 
+#include "../base/logging.hpp"
+#include "../base/exception.hpp"
 
 namespace yg
 {
   typedef gl::Texture<DATA_TRAITS, true> TDynamicTexture;
   typedef gl::Texture<DATA_TRAITS, false> TStaticTexture;
 
+  DECLARE_EXCEPTION(ResourceManagerException, RootException);
+
   ResourceManager::ResourceManager(size_t vbSize, size_t ibSize, size_t storagesCount,
                                    size_t smallVBSize, size_t smallIBSize, size_t smallStoragesCount,
                                    size_t blitVBSize, size_t blitIBSize, size_t blitStoragesCount,
@@ -260,7 +262,7 @@ namespace yg
     case Rt4Bpp:
       return make_shared_ptr(new gl::Texture<RGBA4Traits, false>(w, h));
     default:
-      throw std::runtime_error("unknows render target format");
+      MYTHROW(ResourceManagerException, ("unknown render target format"));
     };
   }
 
diff --git a/yg/resource_style.hpp b/yg/resource_style.hpp
index 7161c74b07..d80d368c93 100644
--- a/yg/resource_style.hpp
+++ b/yg/resource_style.hpp
@@ -1,11 +1,8 @@
-#ifndef RESOURCE_STYLE_HPP
-#define RESOURCE_STYLE_HPP
+#pragma once
 
 #include "../geometry/rect2d.hpp"
 #include "pen_info.hpp"
 
-#include "../base/start_mem_debug.hpp"
-
 namespace yg
 {
   struct ResourceStyle
@@ -68,7 +65,3 @@ namespace yg
     GenericStyle(m2::RectU const & texRect, int pageID);
   };
 }
-
-#include "../base/start_mem_debug.hpp"
-
-#endif // RESOURCE_STYLE_HPP
diff --git a/yg/screen.hpp b/yg/screen.hpp
index 38140a45e3..f7b7082357 100644
--- a/yg/screen.hpp
+++ b/yg/screen.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "shape_renderer.hpp"
-#include "../std/shared_ptr.hpp"
 
 namespace yg
 {
diff --git a/yg/shape_renderer.cpp b/yg/shape_renderer.cpp
index 42f76273a7..7e9d9c5cd3 100644
--- a/yg/shape_renderer.cpp
+++ b/yg/shape_renderer.cpp
@@ -1,6 +1,11 @@
-#include "../base/SRC_FIRST.hpp"
 #include "shape_renderer.hpp"
 #include "skin.hpp"
+#include "pen_info.hpp"
+#include "resource_style.hpp"
+#include "skin_page.hpp"
+#include "base_texture.hpp"
+
+#include "../geometry/point2d.hpp"
 
 #include "../base/logging.hpp"
 
diff --git a/yg/skin.cpp b/yg/skin.cpp
index 2bc3fc0a99..7f32aa0afb 100644
--- a/yg/skin.cpp
+++ b/yg/skin.cpp
@@ -1,5 +1,4 @@
 #include "skin.hpp"
-#include "texture.hpp"
 #include "skin_page.hpp"
 #include "resource_style.hpp"
 #include "resource_manager.hpp"
diff --git a/yg/skin.hpp b/yg/skin.hpp
index bbcc596b1f..01d6bee75e 100644
--- a/yg/skin.hpp
+++ b/yg/skin.hpp
@@ -1,18 +1,11 @@
 #pragma once
 
-#include "resource_style.hpp"
-#include "pen_info.hpp"
-#include "circle_info.hpp"
-#include "skin_page.hpp"
 #include "../geometry/rect2d.hpp"
-#include "../std/unordered_map.hpp"
+
 #include "../std/shared_ptr.hpp"
 #include "../std/function.hpp"
-#include "../std/map.hpp"
 #include "../std/vector.hpp"
-#include "../std/string.hpp"
-#include "../std/utility.hpp"
-#include "../geometry/packer.hpp"
+#include "../std/queue.hpp"
 
 namespace yg
 {
@@ -34,6 +27,12 @@ namespace yg
 
   class SkinPage;
   class ResourceManager;
+  struct ResourceStyle;
+  struct PenInfo;
+  struct CircleInfo;
+  struct Color;
+  struct GlyphKey;
+  struct FontInfo;
 
   class Skin
   {
diff --git a/yg/skin_loader.cpp b/yg/skin_loader.cpp
index afaffa8366..02db4c96c5 100644
--- a/yg/skin_loader.cpp
+++ b/yg/skin_loader.cpp
@@ -1,10 +1,10 @@
 #include "skin.hpp"
 #include "skin_loader.hpp"
 #include "resource_manager.hpp"
+#include "resource_style.hpp"
+#include "skin_page.hpp"
 
 #include "../base/string_utils.hpp"
-#include "../base/start_mem_debug.hpp"
-
 
 namespace yg
 {
diff --git a/yg/skin_loader.hpp b/yg/skin_loader.hpp
index 2356378877..832ad600c3 100644
--- a/yg/skin_loader.hpp
+++ b/yg/skin_loader.hpp
@@ -1,16 +1,16 @@
 /// @author Siarhei Rachytski
 #pragma once
 
-#include "resource_style.hpp"
-#include "skin.hpp"
-#include "../geometry/rect2d.hpp"
-#include "../base/base.hpp"
-#include "../std/string.hpp"
-#include "../std/list.hpp"
-#include "../std/map.hpp"
-#include "../std/vector.hpp"
+//#include "resource_style.hpp"
+//#include "skin.hpp"
+//#include "../geometry/rect2d.hpp"
+//#include "../base/base.hpp"
+//#include "../std/string.hpp"
+//#include "../std/list.hpp"
+//#include "../std/map.hpp"
+//#include "../std/vector.hpp"
 #include "../std/shared_ptr.hpp"
-#include "../std/utility.hpp"
+//#include "../std/utility.hpp"
 
 /// @example
 /// <?xml version="1.0" ?>
@@ -37,6 +37,9 @@ namespace yg
   }
 
   class ResourceManager;
+  class SkinPage;
+  struct ResourceStyle;
+  struct CharStyle;
 
   class SkinLoader
   {
diff --git a/yg/skin_page.cpp b/yg/skin_page.cpp
index f4bac85b34..6aea7c8b31 100644
--- a/yg/skin_page.cpp
+++ b/yg/skin_page.cpp
@@ -1,19 +1,13 @@
-#include "../base/SRC_FIRST.hpp"
-
-#include <agg_basics.h>
-#include <agg_pixfmt_gray.h>
 #include <agg_pixfmt_rgba.h>
 #include <agg_pixfmt_rgb_packed.h>
 #include <agg_renderer_scanline.h>
 #include <agg_rasterizer_scanline_aa.h>
-#include <agg_path_storage.h>
 #include <agg_scanline_u.h>
 #include <agg_ellipse.h>
-#include <boost/gil/gil_all.hpp>
 
+#include "texture.hpp"
 #include "data_formats.hpp"
 #include "skin_page.hpp"
-#include "texture.hpp"
 #include "resource_style.hpp"
 #include "resource_manager.hpp"
 #include "internal/opengl.hpp"
diff --git a/yg/skin_page.hpp b/yg/skin_page.hpp
index 8030db96b9..00626d0a16 100644
--- a/yg/skin_page.hpp
+++ b/yg/skin_page.hpp
@@ -1,9 +1,6 @@
 #pragma once
 
 #include "../std/shared_ptr.hpp"
-#include "../std/unordered_map.hpp"
-#include "../std/map.hpp"
-#include "../std/vector.hpp"
 
 #include "../geometry/packer.hpp"
 #include "../geometry/rect2d.hpp"
@@ -23,6 +20,7 @@ namespace yg
   struct CharStyle;
   struct ResourceStyle;
   class ResourceManager;
+  struct GlyphInfo;
 
   struct GlyphUploadCmd
   {
diff --git a/yg/symbol_renderer.cpp b/yg/symbol_renderer.cpp
index a0ad11f3dd..e38eef6f61 100644
--- a/yg/symbol_renderer.cpp
+++ b/yg/symbol_renderer.cpp
@@ -1,10 +1,11 @@
-#include "../base/SRC_FIRST.hpp"
 #include "symbol_renderer.hpp"
 #include "skin.hpp"
 #include "defines.hpp"
+#include "resource_style.hpp"
+
+#include "../base/logging.hpp"
 
 #include "../std/bind.hpp"
-#include "../base/logging.hpp"
 
 namespace yg
 {
diff --git a/yg/symbol_renderer.hpp b/yg/symbol_renderer.hpp
index 68820c721c..f494caea96 100644
--- a/yg/symbol_renderer.hpp
+++ b/yg/symbol_renderer.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
 #include "text_renderer.hpp"
+
 #include "../geometry/tree4d.hpp"
+
 #include "../std/map.hpp"
 
 namespace yg
diff --git a/yg/text_renderer.cpp b/yg/text_renderer.cpp
index b6807fd35b..1235d83976 100644
--- a/yg/text_renderer.cpp
+++ b/yg/text_renderer.cpp
@@ -1,12 +1,10 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "defines.hpp"
 #include "text_renderer.hpp"
 #include "resource_manager.hpp"
-#include "texture.hpp"
 #include "skin.hpp"
 #include "render_state.hpp"
 #include "glyph_layout.hpp"
+#include "resource_style.hpp"
 
 #include "../geometry/angles.hpp"
 
diff --git a/yg/texture.hpp b/yg/texture.hpp
index eeb5d8c417..1b2ab502ea 100644
--- a/yg/texture.hpp
+++ b/yg/texture.hpp
@@ -1,17 +1,12 @@
 #pragma once
 
-#include "internal/opengl.hpp"
-#include "color.hpp"
 #include "managed_texture.hpp"
 #include "data_formats.hpp"
-#include "../geometry/point2d.hpp"
-#include "../geometry/rect2d.hpp"
-#include "../std/vector.hpp"
-#include "../3party/boost/boost/gil/gil_all.hpp"
-#include "../3party/boost/boost/mpl/vector_c.hpp"
+
 #include "../platform/platform.hpp"
+
 #include "../coding/lodepng_io.hpp"
-#include "../std/iostream.hpp"
+
 namespace gil = boost::gil;
 namespace mpl = boost::mpl;
 
diff --git a/yg/thread_renderer.cpp b/yg/thread_renderer.cpp
index 9b9e8f9e32..4252c376cc 100644
--- a/yg/thread_renderer.cpp
+++ b/yg/thread_renderer.cpp
@@ -3,7 +3,6 @@
 #include "framebuffer.hpp"
 #include "blitter.hpp"
 #include "rendercontext.hpp"
-#include "texture.hpp"
 #include "renderbuffer.hpp"
 #include "render_state.hpp"
 #include "vertexbuffer.hpp"
diff --git a/yg/thread_renderer.hpp b/yg/thread_renderer.hpp
index df7ebda1af..6a345c1d19 100644
--- a/yg/thread_renderer.hpp
+++ b/yg/thread_renderer.hpp
@@ -1,15 +1,10 @@
 #pragma once
 
-#include "rendercontext.hpp"
 #include "render_state.hpp"
-#include "render_command.hpp"
+
+#include "../geometry/rect2d.hpp"
 
 #include "../std/shared_ptr.hpp"
-#include "../std/unordered_map.hpp"
-#include "../std/list.hpp"
-#include "../base/thread.hpp"
-#include "../base/mutex.hpp"
-#include "../base/condition.hpp"
 
 class ScreenBase;
 
@@ -22,6 +17,9 @@ namespace yg
     class FrameBuffer;
     class RenderBuffer;
     class RenderState;
+    class Blitter;
+    class IndexBuffer;
+    class VertexBuffer;
 
     class ThreadRenderer
     {
diff --git a/yg/vertex.hpp b/yg/vertex.hpp
index 6c2f9deec5..5e72466aa1 100644
--- a/yg/vertex.hpp
+++ b/yg/vertex.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "color.hpp"
+
 #include "../geometry/point2d.hpp"
 
 namespace yg
diff --git a/yg/yg.cpp b/yg/yg.cpp
deleted file mode 100644
index 5545267a3a..0000000000
--- a/yg/yg.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "yg.hpp"
-
-#include "../base/start_mem_debug.hpp"
diff --git a/yg/yg.hpp b/yg/yg.hpp
deleted file mode 100644
index 62dc637fce..0000000000
--- a/yg/yg.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "../base/start_mem_debug.hpp"
-
-
-#include "../base/stop_mem_debug.hpp"
diff --git a/yg/yg.pro b/yg/yg.pro
index 957b6b8f47..54f1a5b821 100644
--- a/yg/yg.pro
+++ b/yg/yg.pro
@@ -18,7 +18,6 @@ include($$ROOT_DIR/common.pri)
 
 SOURCES += \
     internal/opengl.cpp \
-    yg.cpp \
     vertex.cpp \
     resource_manager.cpp \
     skin.cpp \
@@ -62,7 +61,6 @@ SOURCES += \
 
 HEADERS += \
     internal/opengl.hpp \
-    yg.hpp \
     vertex.hpp \
     resource_manager.hpp \
     texture.hpp \
@@ -79,7 +77,6 @@ HEADERS += \
     renderbuffer.hpp \
     base_texture.hpp \
     managed_texture.hpp \
-    pbuffer_texture.hpp \
     fence.hpp \
     thread_renderer.hpp \
     rendercontext.hpp \
diff --git a/yg/yg_tests/screengl_test.cpp b/yg/yg_tests/screengl_test.cpp
index c23dee0ba0..208ad41e00 100644
--- a/yg/yg_tests/screengl_test.cpp
+++ b/yg/yg_tests/screengl_test.cpp
@@ -6,6 +6,7 @@
 #include "../../yg/internal/opengl.hpp"
 #include "../../yg/skin.hpp"
 #include "../../yg/pen_info.hpp"
+#include "../../yg/circle_info.hpp"
 
 #include "../../qt_tstfrm/macros.hpp"
 
diff --git a/yg/yg_tests/screenglglobal_test.cpp b/yg/yg_tests/screenglglobal_test.cpp
index 01a9a8cc88..cab5a72f4f 100644
--- a/yg/yg_tests/screenglglobal_test.cpp
+++ b/yg/yg_tests/screenglglobal_test.cpp
@@ -1,6 +1,7 @@
 #include "../../base/SRC_FIRST.hpp"
 #include "../../yg/screen.hpp"
 #include "../../yg/skin.hpp"
+#include "../../yg/pen_info.hpp"
 #include "../../geometry/screenbase.hpp"
 #include "../../geometry/point2d.hpp"
 #include "../../std/vector.hpp"
diff --git a/yg/yg_tests/skin_test.cpp b/yg/yg_tests/skin_test.cpp
index dea1b6bd3c..eb053a7141 100644
--- a/yg/yg_tests/skin_test.cpp
+++ b/yg/yg_tests/skin_test.cpp
@@ -2,6 +2,7 @@
 #include "../../qt_tstfrm/macros.hpp"
 #include "../skin.hpp"
 #include "../resource_manager.hpp"
+#include "../pen_info.hpp"
 #include "../../std/vector.hpp"
 #include "../../platform/platform.hpp"