diff --git a/rcl/CMakeLists.txt b/rcl/CMakeLists.txt
index 86354b14b..6edfea269 100644
--- a/rcl/CMakeLists.txt
+++ b/rcl/CMakeLists.txt
@@ -27,7 +27,7 @@ if(NOT CMAKE_CXX_STANDARD)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra)
+  add_compile_options(-Wall -Wextra -Wpedantic)
 endif()
 
 set(${PROJECT_NAME}_sources
diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c
index 5aa5ec9ae..4c57153e8 100644
--- a/rcl/src/rcl/node.c
+++ b/rcl/src/rcl/node.c
@@ -47,7 +47,6 @@ extern "C"
 
 #include "./common.h"
 #include "./context_impl.h"
-#include "tinydir/tinydir.h"
 
 #define ROS_SECURITY_STRATEGY_VAR_NAME "ROS_SECURITY_STRATEGY"
 #define ROS_SECURITY_ENABLE_VAR_NAME "ROS_SECURITY_ENABLE"
diff --git a/rcl/src/rcl/security_directory.c b/rcl/src/rcl/security_directory.c
index a30baac10..8d654520f 100644
--- a/rcl/src/rcl/security_directory.c
+++ b/rcl/src/rcl/security_directory.c
@@ -13,11 +13,20 @@
 // limitations under the License.
 
 #include "rcl/security_directory.h"
-#include "tinydir/tinydir.h"
+
+#include "rcl/error_handling.h"
 #include "rcutils/filesystem.h"
 #include "rcutils/get_env.h"
 #include "rcutils/format_string.h"
-#include "rcl/error_handling.h"
+
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wembedded-directive"
+#endif
+#include "tinydir/tinydir.h"
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
 
 /**
  * A security lookup function takes in the node's name, namespace, a security root directory and an allocator;