11 files changed, 25 insertions, 18 deletions
diff --git a/src/libjin/Filesystem/je_asset_database.h b/src/libjin/Filesystem/je_asset_database.h
index ef16263..b8f96f6 100644
--- a/src/libjin/Filesystem/je_asset_database.h
+++ b/src/libjin/Filesystem/je_asset_database.h
@@ -1,3 +1,6 @@
+#ifndef __JE_ASSET_DATABASE_H
+#define __JE_ASSET_DATABASE_H
+
 #include "je_buffer.h"
 #include "../3rdparty/smount/smount.h"
 
@@ -28,4 +31,6 @@ namespace JinEngine
 		};
 
 	} // namespace Filesystem
-} // namespace JinEngine
-\ No newline at end of file
+} // namespace JinEngine
+
+#endif
+\ No newline at end of file
diff --git a/src/libjin/Graphics/Shader/je_base.shader.h b/src/libjin/Graphics/Shader/je_base.shader.h
index 0616751..d6f9d7b 100644
--- a/src/libjin/Graphics/Shader/je_base.shader.h
+++ b/src/libjin/Graphics/Shader/je_base.shader.h
@@ -85,4 +85,4 @@ static const char* SHADER_MAIN_TEXTURE = "jin_MainTexture";
 static const char* SHADER_VERTEX_COORDS = "jin_VertexCoords";
 static const char* SHADER_TEXTURE_COORDS = "jin_TextureCoords";
 
-#endif
-\ No newline at end of file
+#endif // __JE_BASE_SHADER_H
+\ No newline at end of file
diff --git a/src/libjin/Graphics/je_bitmap.cpp b/src/libjin/Graphics/je_bitmap.cpp
index c284d2a..5269606 100644
--- a/src/libjin/Graphics/je_bitmap.cpp
+++ b/src/libjin/Graphics/je_bitmap.cpp
@@ -147,5 +147,5 @@ namespace JinEngine
 			return pixels;
 		}
 
-	}
-}
-\ No newline at end of file
+	} // namespace Graphics
+} // namespace JinEngine
+\ No newline at end of file
diff --git a/src/libjin/Graphics/je_bitmap.h b/src/libjin/Graphics/je_bitmap.h
index eeb065e..8adc326 100644
--- a/src/libjin/Graphics/je_bitmap.h
+++ b/src/libjin/Graphics/je_bitmap.h
@@ -170,4 +170,5 @@ namespace JinEngine
 } // namespace JinEngine
 
 #endif
+
 #endif
 \ No newline at end of file
diff --git a/src/libjin/Graphics/je_color.h b/src/libjin/Graphics/je_color.h
index 01484ff..a3c7582 100644
--- a/src/libjin/Graphics/je_color.h
+++ b/src/libjin/Graphics/je_color.h
@@ -4,7 +4,7 @@
 #ifndef __JE_COLOR_H
 #define __JE_COLOR_H
 #include "../core/je_configuration.h"
-#if LIBJIN_MODULES_RENDER
+#if defined(jin_graphics)
 
 #include "../utils/je_endian.h"
 
@@ -18,8 +18,8 @@ namespace JinEngine
 		class Color
 		{
 		public:
-			/* Built-in Colors */
-			static const Color WHITE;
+            // Built-in colors
+            static const Color WHITE;
 			static const Color BLACK;
 			static const Color RED;
 			static const Color GREEN;
@@ -81,5 +81,6 @@ namespace JinEngine
 	} // namespace Graphics
 } // namespace JinEngine
 
-#endif // LIBJIN_MODULES_RENDER
+#endif // jin_graphics
+
 #endif // __JE_COLOR_H
 \ No newline at end of file
diff --git a/src/libjin/Graphics/je_drawable.h b/src/libjin/Graphics/je_drawable.h
index 28fd28b..2547373 100644
--- a/src/libjin/Graphics/je_drawable.h
+++ b/src/libjin/Graphics/je_drawable.h
@@ -83,7 +83,7 @@ namespace JinEngine
         
         };
     
-    } // namespace render
+    } // namespace Graphics
 } // namespace JinEngine
 
 #endif // LIBJIN_MODULES_RENDER
diff --git a/src/libjin/Graphics/je_gl.cpp b/src/libjin/Graphics/je_gl.cpp
index f27f7ba..9ef1460 100644
--- a/src/libjin/Graphics/je_gl.cpp
+++ b/src/libjin/Graphics/je_gl.cpp
@@ -8,5 +8,5 @@ namespace JinEngine
 
 		OpenGL gl;
 
-	}
-}
+	} // namespace Graphics
+} // namespace JinEngine
diff --git a/src/libjin/Graphics/je_gl.h b/src/libjin/Graphics/je_gl.h
index e0bc81f..703fdc7 100644
--- a/src/libjin/Graphics/je_gl.h
+++ b/src/libjin/Graphics/je_gl.h
@@ -24,7 +24,7 @@ namespace JinEngine
 
 		extern OpenGL gl;
 
-	}
-}
+	} // namespace Graphics
+} // namespace JinEngine
 
 #endif
 \ No newline at end of file
diff --git a/src/libjin/Graphics/je_image.cpp b/src/libjin/Graphics/je_image.cpp
index 9c6f2ad..a905943 100644
--- a/src/libjin/Graphics/je_image.cpp
+++ b/src/libjin/Graphics/je_image.cpp
@@ -43,4 +43,4 @@ namespace JinEngine
 	    }
 
     } // namespace Graphics
-} // namespace JinEngine 
+} // namespace JinEngine 
+\ No newline at end of file
diff --git a/src/libjin/Graphics/je_mesh.cpp b/src/libjin/Graphics/je_mesh.cpp
index de810e7..4ef5a6e 100644
--- a/src/libjin/Graphics/je_mesh.cpp
+++ b/src/libjin/Graphics/je_mesh.cpp
@@ -7,5 +7,5 @@ namespace JinEngine
 
 
 
-	}
-}
-\ No newline at end of file
+	} // namespace Graphics
+} // namespace JinEngine
+\ No newline at end of file
diff --git a/src/libjin/Graphics/je_mesh.h b/src/libjin/Graphics/je_mesh.h
index 29c8916..854b701 100644
--- a/src/libjin/Graphics/je_mesh.h
+++ b/src/libjin/Graphics/je_mesh.h
@@ -15,7 +15,7 @@ namespace JinEngine
 
 		};
 
-	}
-}
+	} // namespace Graphics
+} // namespace JinEngine
 
 #endif
 \ No newline at end of file