diff --git a/examples/callback_passthrough.cpp b/examples/callback_passthrough.cpp
index 8d0203b..8e741f2 100644
--- a/examples/callback_passthrough.cpp
+++ b/examples/callback_passthrough.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/enum.cpp b/examples/enum.cpp
index a5f84f9..7faf7ba 100644
--- a/examples/enum.cpp
+++ b/examples/enum.cpp
@@ -1,5 +1,7 @@
 #include <CLI/CLI.hpp>
+#include <iostream>
 #include <map>
+#include <string>
 
 enum class Level : int { High, Medium, Low };
 
diff --git a/examples/enum_ostream.cpp b/examples/enum_ostream.cpp
index 62bc697..652f233 100644
--- a/examples/enum_ostream.cpp
+++ b/examples/enum_ostream.cpp
@@ -1,4 +1,7 @@
 #include <CLI/CLI.hpp>
+#include <iostream>
+#include <map>
+#include <string>
 
 enum class Level : int { High, Medium, Low };
 
diff --git a/examples/formatter.cpp b/examples/formatter.cpp
index 4d67ec6..277dec0 100644
--- a/examples/formatter.cpp
+++ b/examples/formatter.cpp
@@ -1,4 +1,6 @@
 #include <CLI/CLI.hpp>
+#include <iostream>
+#include <memory>
 
 class MyFormatter : public CLI::Formatter {
   public:
diff --git a/examples/groups.cpp b/examples/groups.cpp
index f8de448..772696f 100644
--- a/examples/groups.cpp
+++ b/examples/groups.cpp
@@ -1,5 +1,7 @@
-#include "CLI/CLI.hpp"
-#include "CLI/Timer.hpp"
+#include <CLI/CLI.hpp>
+#include <CLI/Timer.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
     CLI::AutoTimer("This is a timer");
diff --git a/examples/json.cpp b/examples/json.cpp
index b4c8101..f633b1d 100644
--- a/examples/json.cpp
+++ b/examples/json.cpp
@@ -1,5 +1,9 @@
 #include <CLI/CLI.hpp>
+#include <iostream>
+#include <memory>
 #include <nlohmann/json.hpp>
+#include <string>
+#include <vector>
 
 // This example is only built on GCC 7 on Travis due to mismatch in stdlib
 // for clang (CLI11 is forgiving about mismatches, json.hpp is not)
diff --git a/examples/modhelp.cpp b/examples/modhelp.cpp
index a256832..b5b6ac1 100644
--- a/examples/modhelp.cpp
+++ b/examples/modhelp.cpp
@@ -1,7 +1,6 @@
-
-#include "CLI/CLI.hpp"
-
+#include <CLI/CLI.hpp>
 #include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
     CLI::App test{R"raw(Modify the help print so that argument values are accessible.
diff --git a/examples/option_groups.cpp b/examples/option_groups.cpp
index e3cf301..0956d61 100644
--- a/examples/option_groups.cpp
+++ b/examples/option_groups.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/positional_arity.cpp b/examples/positional_arity.cpp
index a0340ec..48d9a43 100644
--- a/examples/positional_arity.cpp
+++ b/examples/positional_arity.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/positional_validation.cpp b/examples/positional_validation.cpp
index 63ff498..fa7e8ae 100644
--- a/examples/positional_validation.cpp
+++ b/examples/positional_validation.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/prefix_command.cpp b/examples/prefix_command.cpp
index edd7a0d..52155d5 100644
--- a/examples/prefix_command.cpp
+++ b/examples/prefix_command.cpp
@@ -1,4 +1,7 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
+#include <vector>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/ranges.cpp b/examples/ranges.cpp
index ace778f..dc3d40e 100644
--- a/examples/ranges.cpp
+++ b/examples/ranges.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <vector>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/retired.cpp b/examples/retired.cpp
index 6c20530..dfa650b 100644
--- a/examples/retired.cpp
+++ b/examples/retired.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <utility>
 #include <vector>
 
 // This example shows the usage of the retired and deprecated option helper methods
diff --git a/examples/shapes.cpp b/examples/shapes.cpp
index 1fcf769..c0b0f76 100644
--- a/examples/shapes.cpp
+++ b/examples/shapes.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <vector>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/simple.cpp b/examples/simple.cpp
index d1ae471..3ba6f8e 100644
--- a/examples/simple.cpp
+++ b/examples/simple.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/subcom_help.cpp b/examples/subcom_help.cpp
index 0d8997d..b2d2019 100644
--- a/examples/subcom_help.cpp
+++ b/examples/subcom_help.cpp
@@ -1,5 +1,6 @@
 #include <CLI/CLI.hpp>
 #include <iostream>
+#include <string>
 
 int main(int argc, char *argv[]) {
     CLI::App cli_global{"Demo app"};
diff --git a/examples/subcom_in_files/subcommand_a.cpp b/examples/subcom_in_files/subcommand_a.cpp
index affc6e8..697b9e0 100644
--- a/examples/subcom_in_files/subcommand_a.cpp
+++ b/examples/subcom_in_files/subcommand_a.cpp
@@ -1,8 +1,6 @@
-// ===================================================================
-//   subcommand_a.cpp
-// ===================================================================
-
 #include "subcommand_a.hpp"
+#include <iostream>
+#include <memory>
 
 /// Set up a subcommand and capture a shared_ptr to a struct that holds all its options.
 /// The variables of the struct are bound to the CLI options.
diff --git a/examples/subcom_in_files/subcommand_a.hpp b/examples/subcom_in_files/subcommand_a.hpp
index f05d6bf..b6660b1 100644
--- a/examples/subcom_in_files/subcommand_a.hpp
+++ b/examples/subcom_in_files/subcommand_a.hpp
@@ -1,10 +1,6 @@
 #pragma once
-// ===================================================================
-//   subcommand_a.hpp
-// ===================================================================
 
-#include "CLI/CLI.hpp"
-#include <memory>
+#include <CLI/CLI.hpp>
 #include <string>
 
 /// Collection of all options of Subcommand A.
diff --git a/examples/subcom_in_files/subcommand_main.cpp b/examples/subcom_in_files/subcommand_main.cpp
index 3befa7a..7fb6c8d 100644
--- a/examples/subcom_in_files/subcommand_main.cpp
+++ b/examples/subcom_in_files/subcommand_main.cpp
@@ -1,8 +1,5 @@
-// ===================================================================
-//   main.cpp
-// ===================================================================
-
 #include "subcommand_a.hpp"
+#include <CLI/CLI.hpp>
 
 int main(int argc, char **argv) {
     CLI::App app{"..."};
diff --git a/examples/subcom_partitioned.cpp b/examples/subcom_partitioned.cpp
index d3afdc5..d2a3606 100644
--- a/examples/subcom_partitioned.cpp
+++ b/examples/subcom_partitioned.cpp
@@ -1,5 +1,8 @@
-#include "CLI/CLI.hpp"
-#include "CLI/Timer.hpp"
+#include <CLI/CLI.hpp>
+#include <CLI/Timer.hpp>
+#include <iostream>
+#include <memory>
+#include <string>
 
 int main(int argc, char **argv) {
     CLI::AutoTimer("This is a timer");
diff --git a/examples/subcommands.cpp b/examples/subcommands.cpp
index 580f4d1..61bdcea 100644
--- a/examples/subcommands.cpp
+++ b/examples/subcommands.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {
 
diff --git a/examples/validators.cpp b/examples/validators.cpp
index d431ed2..35e948b 100644
--- a/examples/validators.cpp
+++ b/examples/validators.cpp
@@ -1,4 +1,6 @@
-#include "CLI/CLI.hpp"
+#include <CLI/CLI.hpp>
+#include <iostream>
+#include <string>
 
 int main(int argc, char **argv) {