diff --git a/winpr/include/winpr/file.h b/winpr/include/winpr/file.h
index 53100e447..1fa9b132c 100644
--- a/winpr/include/winpr/file.h
+++ b/winpr/include/winpr/file.h
@@ -263,12 +263,6 @@ extern "C"
 {
 #endif
 
-	WINPR_ATTR_MALLOC(CloseHandle, 1)
-	WINPR_API HANDLE winpr_CreateFile(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
-	                                  LPSECURITY_ATTRIBUTES lpSecurityAttributes,
-	                                  DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
-	                                  HANDLE hTemplateFile);
-
 	WINPR_DEPRECATED_VAR("since 3.16.0, Use winpr_CreateFile",
 	                     WINPR_ATTR_MALLOC(CloseHandle, 1) WINPR_API HANDLE CreateFileA(
 	                         LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
@@ -472,7 +466,11 @@ typedef struct
 
 #endif /* _WIN32 */
 
-WINPR_API BOOL ValidFileNameComponent(LPCWSTR lpFileName);
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+	WINPR_API BOOL ValidFileNameComponent(LPCWSTR lpFileName);
 
 #if defined(_UWP) || !defined(_WIN32)
 WINPR_API DWORD GetLogicalDriveStringsA(DWORD nBufferLength, LPSTR lpBuffer);
@@ -480,6 +478,16 @@ WINPR_API DWORD GetLogicalDriveStringsA(DWORD nBufferLength, LPSTR lpBuffer);
 WINPR_API DWORD GetLogicalDriveStringsW(DWORD nBufferLength, LPWSTR lpBuffer);
 #endif
 
+WINPR_ATTR_MALLOC(CloseHandle, 1)
+WINPR_API HANDLE winpr_CreateFile(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
+	                              LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+	                              DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
+	                              HANDLE hTemplateFile);
+
+#ifdef __cplusplus
+}
+#endif
+
 #ifdef _UWP
 
 #ifdef __cplusplus