diff --git a/include/xlnt/packaging/uri.hpp b/include/xlnt/packaging/uri.hpp
index 4ae214c7..858cb9eb 100644
--- a/include/xlnt/packaging/uri.hpp
+++ b/include/xlnt/packaging/uri.hpp
@@ -113,7 +113,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    path path() const;
+    class path path() const;
 
     /// <summary>
     ///
diff --git a/include/xlnt/workbook/workbook.hpp b/include/xlnt/workbook/workbook.hpp
index 54ede999..a1405443 100644
--- a/include/xlnt/workbook/workbook.hpp
+++ b/include/xlnt/workbook/workbook.hpp
@@ -346,7 +346,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    std::vector<named_range> named_ranges() const;
+    std::vector<xlnt::named_range> named_ranges() const;
 
     /// <summary>
     ///
@@ -366,7 +366,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    xlnt::range named_range(const std::string &name);
+    class range named_range(const std::string &name);
 
     /// <summary>
     ///
@@ -603,7 +603,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    manifest &manifest();
+    class manifest &manifest();
 
     /// <summary>
     ///
diff --git a/include/xlnt/worksheet/sheet_view.hpp b/include/xlnt/worksheet/sheet_view.hpp
index fbddd957..f591454b 100644
--- a/include/xlnt/worksheet/sheet_view.hpp
+++ b/include/xlnt/worksheet/sheet_view.hpp
@@ -90,12 +90,12 @@ public:
     /// <summary>
     ///
     /// </summary>
-    std::vector<selection> selections() const { return selections_; }
+    std::vector<xlnt::selection> selections() const { return selections_; }
 
     /// <summary>
     ///
     /// </summary>
-    class selection &selection(std::size_t index) { return selections_.at(index); }
+    class xlnt::selection &selection(std::size_t index) { return selections_.at(index); }
 
     /// <summary>
     ///
diff --git a/include/xlnt/worksheet/worksheet.hpp b/include/xlnt/worksheet/worksheet.hpp
index 7ff1ae08..644eba5e 100644
--- a/include/xlnt/worksheet/worksheet.hpp
+++ b/include/xlnt/worksheet/worksheet.hpp
@@ -109,7 +109,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    workbook &workbook();
+    class workbook &workbook();
 
     /// <summary>
     ///
@@ -200,7 +200,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    xlnt::range range(const std::string &reference_string);
+    class range range(const std::string &reference_string);
 
     /// <summary>
     ///
diff --git a/source/detail/stylesheet.hpp b/source/detail/stylesheet.hpp
index e9516b05..b029c655 100644
--- a/source/detail/stylesheet.hpp
+++ b/source/detail/stylesheet.hpp
@@ -60,7 +60,7 @@ struct stylesheet
         return xlnt::format(&impl);
     }
 
-    format format(std::size_t index)
+    class format format(std::size_t index)
     {
         auto iter = format_impls.begin();
         std::advance(iter, static_cast<std::list<format_impl>::difference_type>(index));