diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt
index a299f85160c..e8886abd66e 100644
--- a/base/applications/dxdiag/CMakeLists.txt
+++ b/base/applications/dxdiag/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp
-    ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib)
+    ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp)
 
 list(APPEND SOURCE
     system.c
diff --git a/base/applications/dxdiag/precomp.h b/base/applications/dxdiag/precomp.h
index 4e16e04db45..5c9f003f37a 100644
--- a/base/applications/dxdiag/precomp.h
+++ b/base/applications/dxdiag/precomp.h
@@ -23,7 +23,6 @@
 #include <devguid.h>
 #include <strsafe.h>
 #include <udmihelp.h>
-#include <dmilib.h>
 
 #include "resource.h"
 
diff --git a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
index 69f16902979..dac908585f2 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
+++ b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp
-    ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib)
+    ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp)
 
 add_executable(systeminfo systeminfo.c systeminfo.rc)
 set_module_type(systeminfo win32cui)
diff --git a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c
index e0adc2d5a70..bec9b7a4952 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c
+++ b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c
@@ -28,7 +28,6 @@
 #include <iphlpapi.h>
 #include <winsock2.h>
 #include <udmihelp.h>
-#include <dmilib.h>
 
 #include "resource.h"
 
diff --git a/sdk/lib/dmilib/dmilib.h b/sdk/lib/dmilib/dmilib.h
index 22f2331725d..b3683b80b80 100644
--- a/sdk/lib/dmilib/dmilib.h
+++ b/sdk/lib/dmilib/dmilib.h
@@ -1,7 +1,6 @@
 /*
  * PROJECT:     ReactOS DMI/SMBIOS Library
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dmilib.h
  * PURPOSE:     SMBIOS table parsing functions
  * PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org)
  */
diff --git a/sdk/lib/udmihelp/udmihelp.h b/sdk/lib/udmihelp/udmihelp.h
index 8ed59d9f3c9..265332d8f9c 100644
--- a/sdk/lib/udmihelp/udmihelp.h
+++ b/sdk/lib/udmihelp/udmihelp.h
@@ -7,6 +7,12 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <../dmilib/dmilib.h>
+
 PVOID
 LoadSMBiosData(
     _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings);
@@ -25,3 +31,7 @@ GetSMBiosStringW(
 VOID
 FreeSMBiosData(
     _In_ PVOID Buffer);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif