diff --git a/include/xlnt/cell/cell.hpp b/include/xlnt/cell/cell.hpp
index 5d0e37f2..63972ecc 100644
--- a/include/xlnt/cell/cell.hpp
+++ b/include/xlnt/cell/cell.hpp
@@ -250,8 +250,8 @@ public:
     /// <summary>
     /// Returns the number format of this cell.
     /// </summary>
-    number_format number_format() const;
-    
+    xlnt::number_format number_format() const;
+
 	/// <summary>
 	/// Creates a new format in the workbook, sets its number_format
 	/// to the given format, and applies the format to this cell.
@@ -261,7 +261,7 @@ public:
     /// <summary>
     /// Returns the font applied to the text in this cell.
     /// </summary>
-    font font() const;
+    xlnt::font font() const;
 
 	/// <summary>
 	/// Creates a new format in the workbook, sets its font
@@ -272,7 +272,7 @@ public:
     /// <summary>
     /// Returns the fill applied to this cell.
     /// </summary>
-    fill fill() const;
+    xlnt::fill fill() const;
 
 	/// <summary>
 	/// Creates a new format in the workbook, sets its fill
@@ -283,7 +283,7 @@ public:
     /// <summary>
     /// Returns the border of this cell.
     /// </summary>
-    border border() const;
+    xlnt::border border() const;
 
 	/// <summary>
 	/// Creates a new format in the workbook, sets its border
@@ -294,7 +294,7 @@ public:
     /// <summary>
     /// Returns the alignment of the text in this cell.
     /// </summary>
-    alignment alignment() const;
+    xlnt::alignment alignment() const;
 
 	/// <summary>
 	/// Creates a new format in the workbook, sets its alignment
@@ -305,7 +305,7 @@ public:
     /// <summary>
     /// Returns the protection of this cell.
     /// </summary>
-    protection protection() const;
+    xlnt::protection protection() const;
 
 	/// <summary>
 	/// Creates a new format in the workbook, sets its protection
@@ -414,7 +414,7 @@ public:
     /// <summary>
     /// Return the worksheet that owns this cell.
     /// </summary>
-    worksheet worksheet();
+    class worksheet worksheet();
 
     /// <summary>
     /// Return the worksheet that owns this cell.
@@ -424,7 +424,7 @@ public:
     /// <summary>
     /// Return the workbook of the worksheet that owns this cell.
     /// </summary>
-    workbook &workbook();
+    class workbook &workbook();
 
     /// <summary>
     /// Return the workbook of the worksheet that owns this cell.
diff --git a/include/xlnt/packaging/relationship.hpp b/include/xlnt/packaging/relationship.hpp
index e82d8271..841be484 100644
--- a/include/xlnt/packaging/relationship.hpp
+++ b/include/xlnt/packaging/relationship.hpp
@@ -108,7 +108,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    relationship(const std::string &id, relationship_type t, const uri &source, const uri &target, target_mode mode);
+    relationship(const std::string &id, relationship_type t, const uri &source, const uri &target, xlnt::target_mode mode);
 
     /// <summary>
     /// Returns a string of the form rId# that identifies the relationship.
@@ -123,7 +123,7 @@ public:
     /// <summary>
     /// Returns whether the target of the relationship is internal or external to the package.
     /// </summary>
-    target_mode target_mode() const;
+    xlnt::target_mode target_mode() const;
 
     /// <summary>
     /// Returns the URI of the package part this relationship points to.
diff --git a/include/xlnt/workbook/workbook.hpp b/include/xlnt/workbook/workbook.hpp
index 781359ac..54ede999 100644
--- a/include/xlnt/workbook/workbook.hpp
+++ b/include/xlnt/workbook/workbook.hpp
@@ -366,7 +366,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    range named_range(const std::string &name);
+    xlnt::range named_range(const std::string &name);
 
     /// <summary>
     ///
@@ -542,29 +542,29 @@ public:
     /// <summary>
     ///
     /// </summary>
-    const theme &theme() const;
+    const xlnt::theme &theme() const;
 
     /// <summary>
     ///
     /// </summary>
-	void theme(const class theme &value);
+    void theme(const class theme &value);
 
     // formats
 
     /// <summary>
     ///
     /// </summary>
-    format format(std::size_t format_index);
+    xlnt::format format(std::size_t format_index);
 
     /// <summary>
     ///
     /// </summary>
-    const class format format(std::size_t format_index) const;
+    const xlnt::format format(std::size_t format_index) const;
 
     /// <summary>
     ///
     /// </summary>
-	class format create_format(bool default_format = false);
+    xlnt::format create_format(bool default_format = false);
 
     /// <summary>
     ///
diff --git a/include/xlnt/worksheet/page_setup.hpp b/include/xlnt/worksheet/page_setup.hpp
index 8f180072..ea3a114d 100644
--- a/include/xlnt/worksheet/page_setup.hpp
+++ b/include/xlnt/worksheet/page_setup.hpp
@@ -45,7 +45,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    page_break page_break() const;
+    xlnt::page_break page_break() const;
 
     /// <summary>
     ///
@@ -55,7 +55,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    sheet_state sheet_state() const;
+    xlnt::sheet_state sheet_state() const;
 
     /// <summary>
     ///
@@ -65,7 +65,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    paper_size paper_size() const;
+    xlnt::paper_size paper_size() const;
 
     /// <summary>
     ///
@@ -75,7 +75,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    orientation orientation() const;
+    xlnt::orientation orientation() const;
 
     /// <summary>
     ///
diff --git a/include/xlnt/worksheet/sheet_view.hpp b/include/xlnt/worksheet/sheet_view.hpp
index 2bf421ae..fbddd957 100644
--- a/include/xlnt/worksheet/sheet_view.hpp
+++ b/include/xlnt/worksheet/sheet_view.hpp
@@ -55,7 +55,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    pane &pane() { return pane_.get(); }
+    struct pane &pane() { return pane_.get(); }
 
     /// <summary>
     ///
@@ -80,7 +80,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    void add_selection(const selection &new_selection) { selections_.push_back(new_selection); }
+    void add_selection(const class selection &new_selection) { selections_.push_back(new_selection); }
 
     /// <summary>
     ///
diff --git a/include/xlnt/worksheet/worksheet.hpp b/include/xlnt/worksheet/worksheet.hpp
index 95479b3f..7ff1ae08 100644
--- a/include/xlnt/worksheet/worksheet.hpp
+++ b/include/xlnt/worksheet/worksheet.hpp
@@ -175,7 +175,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    cell cell(column_t column, row_t row);
+    class cell cell(column_t column, row_t row);
 
     /// <summary>
     ///
@@ -200,7 +200,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    range range(const std::string &reference_string);
+    xlnt::range range(const std::string &reference_string);
 
     /// <summary>
     ///
@@ -247,12 +247,12 @@ public:
     /// <summary>
     ///
     /// </summary>
-    column_properties &column_properties(column_t column);
+    xlnt::column_properties &column_properties(column_t column);
 
     /// <summary>
     ///
     /// </summary>
-    const class column_properties &column_properties(column_t column) const;
+    const xlnt::column_properties &column_properties(column_t column) const;
 
     /// <summary>
     ///
@@ -267,12 +267,12 @@ public:
     /// <summary>
     ///
     /// </summary>
-    row_properties &row_properties(row_t row);
+    xlnt::row_properties &row_properties(row_t row);
 
     /// <summary>
     ///
     /// </summary>
-    const class row_properties &row_properties(row_t row) const;
+    const xlnt::row_properties &row_properties(row_t row) const;
 
     /// <summary>
     ///
@@ -516,7 +516,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    page_setup page_setup() const;
+    xlnt::page_setup page_setup() const;
 
     /// <summary>
     ///
@@ -531,7 +531,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    page_margins page_margins() const;
+    xlnt::page_margins page_margins() const;
 
     /// <summary>
     ///
@@ -600,12 +600,12 @@ public:
     /// <summary>
     ///
     /// </summary>
-    header_footer &header_footer();
+    xlnt::header_footer &header_footer();
 
     /// <summary>
     ///
     /// </summary>
-    const class header_footer &header_footer() const;
+    const xlnt::header_footer &header_footer() const;
 
     /// <summary>
     ///
@@ -620,7 +620,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    sheet_state sheet_state() const;
+    xlnt::sheet_state sheet_state() const;
 
     /// <summary>
     ///