diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index e64413cfa..0b286c4fc 100644
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -233,16 +233,16 @@ void Process::IOThreadProc(int tid)
 #endif /* _WIN32 */
 
 			for (int i = 1; i < count; i++) {
+				std::map<ProcessHandle, Process::Ptr>::iterator it;
+#ifdef _WIN32
+				it = l_Processes[tid].find(handles[i]);
+#else /* _WIN32 */
 				std::map<ConsoleHandle, ProcessHandle>::iterator it2;
 				it2 = l_FDs[tid].find(pfds[i].fd);
 
 				if (it2 == l_FDs[tid].end())
 					continue; /* This should never happen. */
 
-				std::map<ProcessHandle, Process::Ptr>::iterator it;
-#ifdef _WIN32
-				it = l_Processes[tid].find(handles[i]);
-#else /* _WIN32 */
 				it = l_Processes[tid].find(it2->second);
 #endif /* _WIN32 */
 
diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index c11a43e09..be1a91ca7 100644
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -477,8 +477,8 @@ bool Utility::Glob(const String& pathSpec, const boost::function<void (const Str
 		String path = DirName(pathSpec) + "/" + wfd.cFileName;
 
 		if ((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (type & GlobDirectory))
-			dirs.push_back(path)
-		else if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (type & GlobFile)
+			dirs.push_back(path);
+		else if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (type & GlobFile))
 			files.push_back(path);
 	} while (FindNextFile(handle, &wfd));
 
diff --git a/lib/icinga/customvarobject.h b/lib/icinga/customvarobject.h
index b472aa521..09b927b8e 100644
--- a/lib/icinga/customvarobject.h
+++ b/lib/icinga/customvarobject.h
@@ -20,6 +20,7 @@
 #ifndef CUSTOMVAROBJECT_H
 #define CUSTOMVAROBJECT_H
 
+#include "icinga/i2-icinga.h"
 #include "icinga/customvarobject.th"
 #include "base/dynamicobject.h"
 #include "remote/messageorigin.h"
@@ -53,7 +54,7 @@ enum ModifiedAttributeType
  *
  * @ingroup icinga
  */
-class I2_BASE_API CustomVarObject : public ObjectImpl<CustomVarObject>
+class I2_ICINGA_API CustomVarObject : public ObjectImpl<CustomVarObject>
 {
 public:
 	DECLARE_PTR_TYPEDEFS(CustomVarObject);