diff --git a/include/xlnt/styles/border.hpp b/include/xlnt/styles/border.hpp
index cd206fb8..c02c23e4 100644
--- a/include/xlnt/styles/border.hpp
+++ b/include/xlnt/styles/border.hpp
@@ -62,14 +62,14 @@ public:
 	class XLNT_CLASS border_property
 	{
 	public:
-		optional<color> color() const;
+		optional<class color> color() const;
 		border_property &color(const xlnt::color &c);
 
 		optional<border_style> style() const;
 		border_property &style(border_style style);
 
 	private:
-		optional<xlnt::color> color_;
+		optional<class color> color_;
 		optional<border_style> style_;
 	};
 
diff --git a/include/xlnt/styles/fill.hpp b/include/xlnt/styles/fill.hpp
index a7cffb01..385e8c29 100644
--- a/include/xlnt/styles/fill.hpp
+++ b/include/xlnt/styles/fill.hpp
@@ -188,13 +188,13 @@ public:
 	/// Returns the gradient fill represented by this fill.
 	/// Throws an invalid_attribute exception if this is not a gradient fill.
 	/// </summary>
-    gradient_fill gradient_fill() const;
+    class gradient_fill gradient_fill() const;
 
 	/// <summary>
 	/// Returns the pattern fill represented by this fill.
 	/// Throws an invalid_attribute exception if this is not a pattern fill.
 	/// </summary>
-    pattern_fill pattern_fill() const;
+    class pattern_fill pattern_fill() const;
 
 protected:
     std::string to_hash_string() const override;