diff --git a/lib/common/debug.h b/lib/common/debug.h
index 8ef37a908..4b60ddf7f 100644
--- a/lib/common/debug.h
+++ b/lib/common/debug.h
@@ -71,12 +71,9 @@
 #  endif
 #endif
 
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
 #if (DEBUGLEVEL>=2)
 #  define ZSTD_DEPS_NEED_IO
+#  include "zstd_deps.h"
 extern int g_debuglevel; /* the variable is only declared,
                             it actually lives in debug.c,
                             and is shared by the whole process.
@@ -107,9 +104,4 @@ extern int g_debuglevel; /* the variable is only declared,
 #  define DEBUGLOG(l, ...) do { } while (0)    /* disabled */
 #endif
 
-
-#if defined (__cplusplus)
-}
-#endif
-
 #endif /* DEBUG_H_12987983217 */
diff --git a/lib/common/huf.h b/lib/common/huf.h
index bfcec4a81..962fe43fa 100644
--- a/lib/common/huf.h
+++ b/lib/common/huf.h
@@ -278,8 +278,8 @@ size_t HUF_readDTableX1_wksp(HUF_DTable* DTable, const void* src, size_t srcSize
 size_t HUF_readDTableX2_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int flags);
 #endif
 
-#endif   /* HUF_H_298734234 */
-
 #if defined (__cplusplus)
 }
 #endif
+
+#endif   /* HUF_H_298734234 */