diff --git a/src/osdi/osdiregistry.c b/src/osdi/osdiregistry.c
index 547c1025f..757a78f3e 100644
--- a/src/osdi/osdiregistry.c
+++ b/src/osdi/osdiregistry.c
@@ -26,6 +26,7 @@
 
 #undef BOOLEAN
 #include <windows.h>
+#include <shlwapi.h>
 #define OPENLIB(path) LoadLibrary(path)
 #define GET_SYM(lib, sym) ((void *)GetProcAddress(lib, sym))
 char *dlerror(void);
@@ -92,7 +93,7 @@ static char *resolve_path(const char *name) {
 #endif
 
   return (char *)NULL;
-} 
+} /* end of function inp_pathresolve */
 
 static char *resolve_input_path(const char *name) {
   /* if name is an absolute path name,
@@ -180,7 +181,7 @@ static size_t calc_osdi_instance_data_off(const OsdiDescriptor *descr) {
   (OsdiObjectFile) { .num_entries = -1 }
 
 #define EMPTY_OBJECT                                                           \
-  (OsdiObjectFile) {}
+  (OsdiObjectFile) {NULL, 0}
 
 #define ERR_AND_RET                                                            \
   error = dlerror();                                                           \