diff --git a/metamod/src/dllapi.h b/metamod/src/dllapi.h
index 8f2ac0f..8b1d856 100644
--- a/metamod/src/dllapi.h
+++ b/metamod/src/dllapi.h
@@ -1,5 +1,19 @@
 #pragma once
 
+#include <eiface.h>
+
+#ifndef DLLEXPORT
+#ifdef _WIN32
+#define DLLEXPORT	__declspec(dllexport)
+#else
+#define DLLEXPORT	__attribute__((visibility("default")))
+#endif // _WIN32
+#endif // DLLEXPORT
+
+#ifndef C_DLLEXPORT
+#define C_DLLEXPORT extern "C" DLLEXPORT
+#endif
+
 typedef void (*FN_GAMEINIT)();
 
 // Typedefs for these are provided in SDK engine/eiface.h, but I didn't
diff --git a/metamod/src/mutil.h b/metamod/src/mutil.h
index 37ec342..048bfe9 100644
--- a/metamod/src/mutil.h
+++ b/metamod/src/mutil.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <util.h>
-#include <dllapi.h>
-#include <plinfo.h>
+#include <extdll.h>
+#include "plinfo.h"
 
 // For GetGameInfo:
 enum ginfo_t