diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h
index 30c4dced6..145aeccd3 100644
--- a/indra/llcommon/llavatarname.h
+++ b/indra/llcommon/llavatarname.h
@@ -32,7 +32,7 @@
 
 class LLSD;
 
-class LLAvatarName
+class LL_COMMON_API LLAvatarName
 {
 public:
 	LLAvatarName();
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 969799e46..99013e652 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -142,6 +142,7 @@
 #define LL_DLLIMPORT
 #endif // LL_WINDOWS
 
+/*
 #ifdef llcommon_EXPORTS
 // Compiling llcommon (shared)
 #define LL_COMMON_API LL_DLLEXPORT
@@ -149,5 +150,9 @@
 // Using llcommon (shared)
 #define LL_COMMON_API LL_DLLIMPORT
 #endif // llcommon_EXPORTS
+*/
+
+//I hate DLLs -SG
+#define LL_COMMON_API
 
 #endif	//	not LL_LINDEN_PREPROCESSOR_H