14 files changed, 35 insertions, 27 deletions
diff --git a/src/libjin/Render/Canvas.cpp b/src/libjin/Render/Canvas.cpp
index 8cb34ca..4f0f48d 100644
--- a/src/libjin/Render/Canvas.cpp
+++ b/src/libjin/Render/Canvas.cpp
@@ -129,6 +129,7 @@ namespace render
         glLoadIdentity();
     }
 
-}
-}
+} // render
+} // jin
+
 #endif // JIN_MODULES_RENDER
 \ No newline at end of file
diff --git a/src/libjin/Render/Canvas.h b/src/libjin/Render/Canvas.h
index 8cced23..9afa42d 100644
--- a/src/libjin/Render/Canvas.h
+++ b/src/libjin/Render/Canvas.h
@@ -33,8 +33,8 @@ namespace render
 
         bool init();
     };
-}
-}
+} // render
+} // jin
 
-#endif
 #endif // JIN_MODULES_RENDER
+#endif // __JIN_CANVAS_H
+\ No newline at end of file
diff --git a/src/libjin/Render/Color.h b/src/libjin/Render/Color.h
index 7b88799..eb2875e 100644
--- a/src/libjin/Render/Color.h
+++ b/src/libjin/Render/Color.h
@@ -24,8 +24,8 @@ namespace render
         int word;
     };
 
-}
-}
+} // render
+} // jin
 
 #endif // JIN_MODULES_RENDER
-#endif
-\ No newline at end of file
+#endif // __JIN_COLOR_H
+\ No newline at end of file
diff --git a/src/libjin/Render/Drawable.cpp b/src/libjin/Render/Drawable.cpp
index cbdf250..0a250cb 100644
--- a/src/libjin/Render/Drawable.cpp
+++ b/src/libjin/Render/Drawable.cpp
@@ -71,7 +71,7 @@ namespace render
 
         glDisable(GL_TEXTURE_2D);
     }
-}
-}
+} // render
+} // jin
 
 #endif // JIN_MODULES_RENDER
 \ No newline at end of file
diff --git a/src/libjin/Render/Drawable.h b/src/libjin/Render/Drawable.h
index f8e25a2..621f1a8 100644
--- a/src/libjin/Render/Drawable.h
+++ b/src/libjin/Render/Drawable.h
@@ -34,7 +34,9 @@ namespace render
         };
 
     protected:
-#define DRAWABLE_V_SIZE 8
+
+        const int DRAWABLE_V_SIZE = 8;
+
         void setVertices(float* v, float* t);
         
         GLuint texture; 
@@ -49,8 +51,8 @@ namespace render
         float* vertCoord;
 
     };
-}
-}// jin
+} // render
+} // jin
 
 #endif // JIN_MODULES_RENDER
-#endif
+#endif // __JIN_DRAWABLE
+\ No newline at end of file
diff --git a/src/libjin/Render/Font.cpp b/src/libjin/Render/Font.cpp
index e8e71b2..741b992 100644
--- a/src/libjin/Render/Font.cpp
+++ b/src/libjin/Render/Font.cpp
@@ -13,10 +13,10 @@ namespace render
 {
 
     using namespace jin::math;
-
-#define BITMAP_WIDTH  512
-#define BITMAP_HEIGHT 512
-#define PIXEL_HEIGHT 32
+    
+    const int BITMAP_WIDTH = 512;
+    const int BITMAP_HEIGHT = 512;
+    const int PIXEL_HEIGHT = 32;
 
     Font::Font():Drawable()
     {
@@ -190,4 +190,5 @@ namespace render
 
 }
 }
+
 #endif // JIN_MODULES_RENDER
 \ No newline at end of file
diff --git a/src/libjin/Render/Font.h b/src/libjin/Render/Font.h
index f2a57ed..cde64b5 100644
--- a/src/libjin/Render/Font.h
+++ b/src/libjin/Render/Font.h
@@ -58,4 +58,4 @@ namespace render
 }
 
 #endif // JIN_MODULES_RENDER
-#endif
-\ No newline at end of file
+#endif // __JIN_FONT_H
+\ No newline at end of file
diff --git a/src/libjin/Render/Graphics.h b/src/libjin/Render/Graphics.h
index 13dd4d1..84cd6ff 100644
--- a/src/libjin/Render/Graphics.h
+++ b/src/libjin/Render/Graphics.h
@@ -36,5 +36,6 @@ namespace render
     extern void polygon(RENDER_MODE mode, float* p, int count);
 }
 }
+
 #endif // JIN_MODULES_RENDER
-#endif // __JIN_GRAPHICS_H
+#endif // __JIN_GRAPHICS_H
+\ No newline at end of file
diff --git a/src/libjin/Render/JSL.cpp b/src/libjin/Render/JSL.cpp
index 4ce660b..b49c9b7 100644
--- a/src/libjin/Render/JSL.cpp
+++ b/src/libjin/Render/JSL.cpp
@@ -155,4 +155,5 @@ namespace render
 
 }
 }
-#endif // JIN_MODULES_RENDER
+
+#endif // JIN_MODULES_RENDER
+\ No newline at end of file
diff --git a/src/libjin/Render/JSL.h b/src/libjin/Render/JSL.h
index 741983a..068d5e0 100644
--- a/src/libjin/Render/JSL.h
+++ b/src/libjin/Render/JSL.h
@@ -71,4 +71,4 @@ namespace render
 }
 
 #endif // JIN_MODULES_RENDER
-#endif
+#endif // __JIN_JSL_H
+\ No newline at end of file
diff --git a/src/libjin/Render/Render.h b/src/libjin/Render/Render.h
index e51051e..640c148 100644
--- a/src/libjin/Render/Render.h
+++ b/src/libjin/Render/Render.h
@@ -12,4 +12,4 @@
 #include "window.h"
 
 #endif // JIN_MODULES_RENDER
-#endif
-\ No newline at end of file
+#endif // __JIN_RENDER_H
+\ No newline at end of file
diff --git a/src/libjin/Render/Texture.cpp b/src/libjin/Render/Texture.cpp
index cee3552..d9abe40 100644
--- a/src/libjin/Render/Texture.cpp
+++ b/src/libjin/Render/Texture.cpp
@@ -96,4 +96,5 @@ namespace render
     }
 }
 }
+
 #endif // JIN_MODULES_RENDER
 \ No newline at end of file
diff --git a/src/libjin/Render/Texture.h b/src/libjin/Render/Texture.h
index d2e4bd0..c42e533 100644
--- a/src/libjin/Render/Texture.h
+++ b/src/libjin/Render/Texture.h
@@ -35,4 +35,4 @@ namespace render
 }
 
 #endif // JIN_MODULES_RENDER
-#endif
-\ No newline at end of file
+#endif // __JIN_IMAGE_H
+\ No newline at end of file
diff --git a/src/libjin/Render/Window.h b/src/libjin/Render/Window.h
index 77b1963..f600e35 100644
--- a/src/libjin/Render/Window.h
+++ b/src/libjin/Render/Window.h
@@ -53,7 +53,8 @@ namespace render
 
     typedef WindowSystem::Setting WindowSetting;
 
-}
-}
+} // render
+} // jin
+
 #endif // JIN_MODULES_RENDER
-#endif
-\ No newline at end of file
+#endif // __JIN_RENDER_WINDOW
+\ No newline at end of file