diff --git a/doomsday/client/include/render/surfacedecorator.h b/doomsday/client/include/render/surfacedecorator.h
index abd6604a6d..541682cc70 100644
--- a/doomsday/client/include/render/surfacedecorator.h
+++ b/doomsday/client/include/render/surfacedecorator.h
@@ -17,15 +17,13 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#ifndef DENG_CLIENT_RENDER_SURFACEDECORATOR_H
-#define DENG_CLIENT_RENDER_SURFACEDECORATOR_H
+#ifndef CLIENT_RENDER_SURFACEDECORATOR_H
+#define CLIENT_RENDER_SURFACEDECORATOR_H
 
 #include <de/libcore.h>
 
 class Surface;
 
-#define MAX_DECOR_LIGHTS        (16384)
-
 /**
  * The decorator assumes responsibility for decorating surfaces according to
  * the defined material when the surface is assigned. When a material changes
@@ -88,4 +86,4 @@ class SurfaceDecorator
     DENG2_PRIVATE(d)
 };
 
-#endif // DENG_CLIENT_RENDER_SURFACEDECORATOR_H
+#endif // CLIENT_RENDER_SURFACEDECORATOR_H
diff --git a/doomsday/client/src/render/surfacedecorator.cpp b/doomsday/client/src/render/surfacedecorator.cpp
index bb6aa1494a..528b1e691a 100644
--- a/doomsday/client/src/render/surfacedecorator.cpp
+++ b/doomsday/client/src/render/surfacedecorator.cpp
@@ -166,7 +166,7 @@ DENG2_PIMPL_NOREF(SurfaceDecorator)
 
     /// Observes MaterialAnimation DecorationStageChange
     void materialAnimationDecorationStageChanged(MaterialAnimation & /*anim*/,
-        Material::Decoration &decor)
+        MaterialDecoration &decor)
     {
         markSurfacesForRedecoration(decor.material());
     }
@@ -233,7 +233,7 @@ static inline Sector *containingSector(Surface &surface)
 {
     if(surface.parent().type() == DMU_PLANE)
         return &surface.parent().as<Plane>().sector();
-    return 0;
+    return nullptr;
 }
 
 void SurfaceDecorator::decorate(Surface &surface)
@@ -265,7 +265,7 @@ void SurfaceDecorator::redecorate()
     MaterialSurfaceMap::iterator i = d->decorated.begin();
     while(i != d->decorated.end())
     {
-        MaterialSnapshot const *materialSnapshot = 0;
+        MaterialSnapshot const *materialSnapshot = nullptr;
 
         SurfaceSet const &surfaceSet = i.value();
         for(Surface *surface : surfaceSet)