diff --git a/ogre_media/materials/glsl120/nogp/nogp.program b/ogre_media/materials/glsl120/nogp/nogp.program
index fe36ea7..a68a87e 100644
--- a/ogre_media/materials/glsl120/nogp/nogp.program
+++ b/ogre_media/materials/glsl120/nogp/nogp.program
@@ -1,10 +1,10 @@
 // These shaders are work-arounds in case geometry shaders
 // are not supported, so vertices can't be created on the graphics card.
-// Multiple vertices are passed in for each primitive, 
+// Multiple vertices are passed in for each primitive,
 // and each one is offset according to its texture coords.
 
 //includes:
-vertex_program rviz/glsl120/include/pass_depth.vert glsl { source ../include/pass_depth.vert }
+vertex_program rviz/glsl120/nogp/pass_depth.vert glsl { source ../include/pass_depth.vert }
 
 vertex_program rviz/glsl120/nogp/billboard_tile.vert glsl
 {
@@ -21,7 +21,7 @@ vertex_program rviz/glsl120/nogp/billboard_tile.vert(with_depth) glsl
 {
   source billboard_tile.vert
   preprocessor_defines WITH_DEPTH=1
-  attach rviz/glsl120/include/pass_depth.vert
+  attach rviz/glsl120/nogp/pass_depth.vert
   default_params
   {
     param_named_auto worldviewproj_matrix worldviewproj_matrix
@@ -47,7 +47,7 @@ vertex_program rviz/glsl120/nogp/billboard.vert(with_depth) glsl
 {
   source billboard.vert
   preprocessor_defines WITH_DEPTH=1
-  attach rviz/glsl120/include/pass_depth.vert
+  attach rviz/glsl120/nogp/pass_depth.vert
   default_params {
     param_named_auto worldviewproj_matrix worldviewproj_matrix
     param_named_auto worldview_matrix     worldview_matrix
@@ -71,7 +71,7 @@ vertex_program rviz/glsl120/nogp/box.vert(with_depth) glsl
 {
   source box.vert
   preprocessor_defines WITH_DEPTH=1
-  attach rviz/glsl120/include/pass_depth.vert
+  attach rviz/glsl120/nogp/pass_depth.vert
   default_params {
     param_named_auto worldviewproj_matrix worldviewproj_matrix
     param_named_auto worldview_matrix     worldview_matrix
diff --git a/src/rviz/ogre_helpers/mesh_shape.cpp b/src/rviz/ogre_helpers/mesh_shape.cpp
index 560e1e3..12f2802 100644
--- a/src/rviz/ogre_helpers/mesh_shape.cpp
+++ b/src/rviz/ogre_helpers/mesh_shape.cpp
@@ -29,6 +29,7 @@
 
 #include "mesh_shape.h"
 
+#include <OgreMesh.h>
 #include <OgreMeshManager.h>
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
@@ -47,7 +48,7 @@ MeshShape::MeshShape(Ogre::SceneManager* scene_manager, Ogre::SceneNode* parent_
 , started_(false)
 {
   static uint32_t count = 0;
-  manual_object_ = scene_manager->createManualObject("MeshShape_ManualObject" + boost::lexical_cast<std::string>(count++)); 
+  manual_object_ = scene_manager->createManualObject("MeshShape_ManualObject" + boost::lexical_cast<std::string>(count++));
   material_->setCullingMode(Ogre::CULL_NONE);
 }
 
@@ -70,7 +71,7 @@ void MeshShape::beginTriangles()
     ROS_WARN("Cannot modify mesh once construction is complete");
     return;
   }
-  
+
   if (!started_)
   {
     started_ = true;
diff --git a/src/test/render_points_test.cpp b/src/test/render_points_test.cpp
index 424f644..b8504c7 100644
--- a/src/test/render_points_test.cpp
+++ b/src/test/render_points_test.cpp
@@ -34,6 +34,9 @@
 #include <QApplication>
 #include <QVBoxLayout>
 
+#include <OgreCamera.h>
+#include <OgreSceneNode.h>
+
 using namespace rviz;
 
 MyFrame::MyFrame( QWidget* parent )
diff --git a/src/test/two_render_widgets.cpp b/src/test/two_render_widgets.cpp
index 8cb630d..f75145d 100644
--- a/src/test/two_render_widgets.cpp
+++ b/src/test/two_render_widgets.cpp
@@ -37,6 +37,9 @@
 
 #include <OgreRenderWindow.h>
 #include <OgreEntity.h>
+#include <OgreSceneNode.h>
+#include <OgreCamera.h>
+#include <OgreViewport.h>
 
 using namespace rviz;