diff --git a/ChangeLog b/ChangeLog
index b24be96..31d8b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,25 @@
 2004-05-06  S.J. Chun <chunsj@embian.com>
             David Ayers  <d.ayers@inode.at>
 
+	* GSWeb.framework/GSWDefines.h: New file.
+	* GSWeb.framework/GSWeb.h: Include GSWDefines.h.
+	
+	* GSWeb.framework/GSWApplication.h: Use GSW_EXPORT instead of
+	export.  Fixed some whitespace issues.
+	* GSWeb.framework/GSWBaseParser.h: Ditto.
+	* GSWeb.framework/GSWConstants.h: Ditto.
+	* GSWeb.framework/GSWDebug.h: Ditto.
+	* GSWeb.framework/GSWDefaultAdaptor.h: Ditto.
+	* GSWeb.framework/GSWElement.h: Ditto.
+	* GSWeb.framework/GSWHTMLAttrLexer.h: Ditto.
+	* GSWeb.framework/GSWHTMLAttrParser.h: Ditto.
+	* GSWeb.framework/GSWHTMLLexer.h: Ditto.
+	* GSWeb.framework/GSWHTMLParser.h: Ditto.
+	* GSWeb.framework/GSWPageDefLexer.h: Ditto.
+	* GSWeb.framework/GSWPageDefParser.h: Ditto.
+	* GSWeb.framework/GSWResourceManager.h: Ditto.
+	* GSWeb.framework/GSWUtils.h: Ditto.
+
 	* GSWeb.framework/GSWSession.h/m
 	([GSWSession permanentPageCacheSize], [GSWSession pageCacheSize]):
 	Replace uint with unsigned int.
diff --git a/GSWeb.framework/GSWApplication.h b/GSWeb.framework/GSWApplication.h
index d7b53a1..34188cc 100644
--- a/GSWeb.framework/GSWApplication.h
+++ b/GSWeb.framework/GSWApplication.h
@@ -33,19 +33,28 @@
 #ifndef _GSWApplication_h__
 	#define _GSWApplication_h__
 
-extern void GSWApplicationSetDebugSetOption(NSString* opt);
-extern int WOApplicationMain(NSString* applicationClassName,
-                             int argc,
-                             const char *argv[]);
-extern int GSWApplicationMain(NSString* applicationClassName,
-                              int argc,
-                              const char *argv[]);
-extern NSString* globalApplicationClassName;
-extern int GSWebNamingConv;//GSWNAMES_INDEX or WONAMES_INDEX
-#define GSWebNamingConvInversed		(GSWebNamingConv==GSWNAMES_INDEX ? WONAMES_INDEX : GSWNAMES_INDEX)
-#define GSWebNamingConvForRound(r)	((r)==0 ? GSWebNamingConv : (GSWebNamingConv==GSWNAMES_INDEX ? WONAMES_INDEX : GSWNAMES_INDEX))
+GSWEB_EXPORT void
+GSWApplicationSetDebugSetOption(NSString* opt);
 
-extern BOOL WOStrictFlag;
+GSWEB_EXPORT int
+WOApplicationMain(NSString* applicationClassName,
+		  int argc, const char *argv[]);
+
+GSWEB_EXPORT int
+GSWApplicationMain(NSString* applicationClassName,
+		   int argc, const char *argv[]);
+
+GSWEB_EXPORT NSString* globalApplicationClassName;
+GSWEB_EXPORT int GSWebNamingConv;//GSWNAMES_INDEX or WONAMES_INDEX
+
+#define GSWebNamingConvInversed		\
+	(GSWebNamingConv==GSWNAMES_INDEX ? WONAMES_INDEX : GSWNAMES_INDEX)
+
+#define GSWebNamingConvForRound(r)	\
+	((r)==0 ? GSWebNamingConv : 	\
+	  (GSWebNamingConv==GSWNAMES_INDEX ? WONAMES_INDEX : GSWNAMES_INDEX))
+
+GSWEB_EXPORT BOOL WOStrictFlag;
 //====================================================================
 @interface GSWApplication : NSObject <NSLocking>
 {
@@ -738,5 +747,5 @@ extern BOOL WOStrictFlag;
 								  template:(GSWElement*)templateElement_; //OldFN
 @end
 */
-extern GSWApplication* GSWApp;
+GSWEB_EXPORT GSWApplication* GSWApp;
 #endif //_GSWApplication_h__
diff --git a/GSWeb.framework/GSWBaseParser.h b/GSWeb.framework/GSWBaseParser.h
index 7539cb7..cd7c920 100644
--- a/GSWeb.framework/GSWBaseParser.h
+++ b/GSWeb.framework/GSWBaseParser.h
@@ -50,8 +50,12 @@
                          columnIndex:(int*)colIndexPtr;
 @end
 
-extern void _ParserDebugLogBuffer(char* fn,char* file,int line,unichar* uniBuf,int length,int index,int charsCount);
-#define ParserDebugLogBuffer(uniBuf,length,index,charsCount) _ParserDebugLogBuffer(__PRETTY_FUNCTION__,__FILE__,__LINE__,uniBuf,length,index,charsCount)
+void
+_ParserDebugLogBuffer(char* fn, char* file, int line, unichar* uniBuf,
+		      int length, int index, int charsCount);
+#define ParserDebugLogBuffer(uniBuf,length,index,charsCount) \
+	_ParserDebugLogBuffer(__PRETTY_FUNCTION__,	\
+	__FILE__, __LINE__, uniBuf, length, index, charsCount)
 
 static inline BOOL _parserIsDigit(unichar c)
 {
diff --git a/GSWeb.framework/GSWConstants.h b/GSWeb.framework/GSWConstants.h
index fda18b7..fcd1e8f 100644
--- a/GSWeb.framework/GSWConstants.h
+++ b/GSWeb.framework/GSWConstants.h
@@ -39,361 +39,361 @@
 // -
 /*
 typedef  NSBoolNumber* BOOLNB;
-extern NSBoolNumber* BNYES;
-extern NSBoolNumber* BNNO;
+GSWEB_EXPORT NSBoolNumber* BNYES;
+GSWEB_EXPORT NSBoolNumber* BNNO;
 */
 
-extern NSString* NSTYES;
-extern NSString* NSTNO;
+GSWEB_EXPORT NSString* NSTYES;
+GSWEB_EXPORT NSString* NSTNO;
 
 
 //====================================================================
 // Suffixes
 #define GSWNAMES_INDEX	0
 #define WONAMES_INDEX	1
-extern NSString* GSWApplicationSuffix[2];
-extern NSString* GSWApplicationPSuffix[2];
-extern NSString* GSWPageSuffix[2];
-extern NSString* GSWPagePSuffix[2];
-extern NSString* GSWScriptSuffix[2];
-extern NSString* GSWScriptPSuffix[2];
-extern NSString* GSWResourceRequestHandlerKey[2];
-extern NSString* GSWComponentRequestHandlerKey[2];
-extern NSString* GSWDirectActionRequestHandlerKey[2];
-extern NSString* GSWPingActionRequestHandlerKey[2];
-extern NSString* GSWStaticResourceRequestHandlerKey[2];
-extern NSString* GSWComponentTemplateSuffix;
-extern NSString* GSWComponentTemplatePSuffix;
-extern NSString* GSWComponentDeclarationsSuffix[2];
-extern NSString* GSWComponentDeclarationsPSuffix[2];
-extern NSString* GSWLibrarySuffix[2];
-extern NSString* GSWLibraryPSuffix[2];
-extern NSString* GSWArchiveSuffix[2];
-extern NSString* GSWArchivePSuffix[2];
-extern NSString* GSWURLPrefix[2];
+GSWEB_EXPORT NSString* GSWApplicationSuffix[2];
+GSWEB_EXPORT NSString* GSWApplicationPSuffix[2];
+GSWEB_EXPORT NSString* GSWPageSuffix[2];
+GSWEB_EXPORT NSString* GSWPagePSuffix[2];
+GSWEB_EXPORT NSString* GSWScriptSuffix[2];
+GSWEB_EXPORT NSString* GSWScriptPSuffix[2];
+GSWEB_EXPORT NSString* GSWResourceRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWComponentRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWDirectActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWPingActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWStaticResourceRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWComponentTemplateSuffix;
+GSWEB_EXPORT NSString* GSWComponentTemplatePSuffix;
+GSWEB_EXPORT NSString* GSWComponentDeclarationsSuffix[2];
+GSWEB_EXPORT NSString* GSWComponentDeclarationsPSuffix[2];
+GSWEB_EXPORT NSString* GSWLibrarySuffix[2];
+GSWEB_EXPORT NSString* GSWLibraryPSuffix[2];
+GSWEB_EXPORT NSString* GSWArchiveSuffix[2];
+GSWEB_EXPORT NSString* GSWArchivePSuffix[2];
+GSWEB_EXPORT NSString* GSWURLPrefix[2];
 
-extern NSString* GSFrameworkSuffix;
-extern NSString* GSFrameworkPSuffix;
-extern NSString* GSLanguageSuffix;
-extern NSString* GSLanguagePSuffix;
-extern NSString* GSWStringTableSuffix;
-extern NSString* GSWStringTablePSuffix;
-extern NSString* GSWStringTableArraySuffix;
-extern NSString* GSWStringTableArrayPSuffix;
-extern NSString* GSWMainPageName;
-extern NSString* GSWMonitorServiceName;
-extern NSString* GSWAPISuffix;
-extern NSString* GSWAPIPSuffix;
+GSWEB_EXPORT NSString* GSFrameworkSuffix;
+GSWEB_EXPORT NSString* GSFrameworkPSuffix;
+GSWEB_EXPORT NSString* GSLanguageSuffix;
+GSWEB_EXPORT NSString* GSLanguagePSuffix;
+GSWEB_EXPORT NSString* GSWStringTableSuffix;
+GSWEB_EXPORT NSString* GSWStringTablePSuffix;
+GSWEB_EXPORT NSString* GSWStringTableArraySuffix;
+GSWEB_EXPORT NSString* GSWStringTableArrayPSuffix;
+GSWEB_EXPORT NSString* GSWMainPageName;
+GSWEB_EXPORT NSString* GSWMonitorServiceName;
+GSWEB_EXPORT NSString* GSWAPISuffix;
+GSWEB_EXPORT NSString* GSWAPIPSuffix;
 
 
 //====================================================================
 // User Class Names
 
-extern NSString* GSWClassName_Session;
-extern NSString* GSWClassName_Application;
-extern NSString* GSWClassName_ResourceManager[2];
-extern NSString* GSWClassName_StatisticsStore[2];
-extern NSString* GSWClassName_ServerSessionStore[2];
-extern NSString* GSWClassName_DefaultAdaptor[2];
-extern NSString* GSWClassName_DefaultContext[2];
-extern NSString* GSWClassName_DefaultResponse[2];
-extern NSString* GSWClassName_DefaultRequest[2];
-extern NSString* GSWClassName_DefaultRecording[2];
+GSWEB_EXPORT NSString* GSWClassName_Session;
+GSWEB_EXPORT NSString* GSWClassName_Application;
+GSWEB_EXPORT NSString* GSWClassName_ResourceManager[2];
+GSWEB_EXPORT NSString* GSWClassName_StatisticsStore[2];
+GSWEB_EXPORT NSString* GSWClassName_ServerSessionStore[2];
+GSWEB_EXPORT NSString* GSWClassName_DefaultAdaptor[2];
+GSWEB_EXPORT NSString* GSWClassName_DefaultContext[2];
+GSWEB_EXPORT NSString* GSWClassName_DefaultResponse[2];
+GSWEB_EXPORT NSString* GSWClassName_DefaultRequest[2];
+GSWEB_EXPORT NSString* GSWClassName_DefaultRecording[2];
 
 //====================================================================
 // Keys
 
-extern NSString* GSWKey_InstanceID[2];
-extern NSString* GSWKey_SessionID[2];
-extern NSString* GSWKey_PageName[2];
-extern NSString* GSWKey_ContextID[2];
-extern NSString* GSWKey_ElementID[2];
-extern NSString* GSWKey_Data[2];
-extern NSString* GSWKey_SubmitAction[2];
-extern NSString* GSWKey_IsmapCoords[2];
+GSWEB_EXPORT NSString* GSWKey_InstanceID[2];
+GSWEB_EXPORT NSString* GSWKey_SessionID[2];
+GSWEB_EXPORT NSString* GSWKey_PageName[2];
+GSWEB_EXPORT NSString* GSWKey_ContextID[2];
+GSWEB_EXPORT NSString* GSWKey_ElementID[2];
+GSWEB_EXPORT NSString* GSWKey_Data[2];
+GSWEB_EXPORT NSString* GSWKey_SubmitAction[2];
+GSWEB_EXPORT NSString* GSWKey_IsmapCoords[2];
 
 //====================================================================
 // HTTP Headers
-extern NSString* GSWHTTPHeader_Cookie;
-extern NSString* GSWHTTPHeader_CookieStupidIIS;
-extern NSString* GSWHTTPHeader_SetCookie;
-extern NSString* GSWHTTPHeader_AdaptorVersion[2];
-extern NSString* GSWHTTPHeader_RequestMethod[2];
-extern NSString* GSWHTTPHeader_Recording[2];
-extern NSString* GSWHTTPHeader_QueryString[2];
-extern NSString* GSWHTTPHeader_RemoteAddress[2];
-extern NSString* GSWHTTPHeader_RemoteHost[2];
-extern NSString* GSWHTTPHeader_RemoteIdent[2];
-extern NSString* GSWHTTPHeader_RemoteUser[2];
-extern NSString* GSWHTTPHeader_ServerName[2];
-extern NSString* GSWHTTPHeader_ServerPort[2];
-extern NSString* GSWHTTPHeader_ServerSoftware[2];
-extern NSString* GSWHTTPHeader_AnnotationServer[2];
-extern NSString* GSWHTTPHeader_AuthPass[2];
-extern NSString* GSWHTTPHeader_AuthType[2];
-extern NSString* GSWHTTPHeader_DocumentRoot[2];
-extern NSString* GSWHTTPHeader_GatewayInterface[2];
-extern NSString* GSWHTTPHeader_Protocol[2];
-extern NSString* GSWHTTPHeader_ProtocolNum[2];
-extern NSString* GSWHTTPHeader_RequestScheme[2];
-extern NSString* GSWHTTPHeader_ApplicationName[2];
-extern NSString* GSWHTTPHeader_RecordingSessionID[2];
-extern NSString* GSWHTTPHeader_RecordingIDsURL[2];
-extern NSString* GSWHTTPHeader_RecordingIDsCookie[2];
-extern NSString* GSWHTTPHeader_RecordingApplicationNumber[2];
-extern NSString* GSWHTTPHeader_LoadAverage[2];
-extern NSString* GSWHTTPHeader_RefuseSessions[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_Cookie;
+GSWEB_EXPORT NSString* GSWHTTPHeader_CookieStupidIIS;
+GSWEB_EXPORT NSString* GSWHTTPHeader_SetCookie;
+GSWEB_EXPORT NSString* GSWHTTPHeader_AdaptorVersion[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RequestMethod[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_Recording[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_QueryString[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RemoteAddress[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RemoteHost[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RemoteIdent[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RemoteUser[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_ServerName[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_ServerPort[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_ServerSoftware[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_AnnotationServer[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_AuthPass[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_AuthType[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_DocumentRoot[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_GatewayInterface[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_Protocol[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_ProtocolNum[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RequestScheme[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_ApplicationName[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RecordingSessionID[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RecordingIDsURL[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RecordingIDsCookie[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RecordingApplicationNumber[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_LoadAverage[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_RefuseSessions[2];
 
-extern NSString* GSWHTTPHeader_Method[2];
-extern NSString* GSWHTTPHeader_MethodPost;
-extern NSString* GSWHTTPHeader_MethodGet;
-extern NSString* GSWHTTPHeader_AcceptLanguage;
-extern NSString* GSWHTTPHeader_AcceptEncoding;
-extern NSString* GSWHTTPHeader_ContentType;
-extern NSString* GSWHTTPHeader_FormURLEncoded;
-extern NSString* GSWHTTPHeader_MultipartFormData;
-extern NSString* GSWHTTPHeader_ContentLength;
-extern NSString* GSWHTTPHeader_MimeType_TextPlain;
-extern NSString* GSWHTTPHeader_UserAgent;
-extern NSString* GSWHTTPHeader_Referer;
+GSWEB_EXPORT NSString* GSWHTTPHeader_Method[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_MethodPost;
+GSWEB_EXPORT NSString* GSWHTTPHeader_MethodGet;
+GSWEB_EXPORT NSString* GSWHTTPHeader_AcceptLanguage;
+GSWEB_EXPORT NSString* GSWHTTPHeader_AcceptEncoding;
+GSWEB_EXPORT NSString* GSWHTTPHeader_ContentType;
+GSWEB_EXPORT NSString* GSWHTTPHeader_FormURLEncoded;
+GSWEB_EXPORT NSString* GSWHTTPHeader_MultipartFormData;
+GSWEB_EXPORT NSString* GSWHTTPHeader_ContentLength;
+GSWEB_EXPORT NSString* GSWHTTPHeader_MimeType_TextPlain;
+GSWEB_EXPORT NSString* GSWHTTPHeader_UserAgent;
+GSWEB_EXPORT NSString* GSWHTTPHeader_Referer;
 
-extern NSString* GSWHTTPHeader_Response_OK;
-extern NSString* GSWHTTPHeader_Response_HeaderLineEnd[2];
+GSWEB_EXPORT NSString* GSWHTTPHeader_Response_OK;
+GSWEB_EXPORT NSString* GSWHTTPHeader_Response_HeaderLineEnd[2];
 
-extern NSString* GSWFormValue_RemoteInvocationPost[2];
+GSWEB_EXPORT NSString* GSWFormValue_RemoteInvocationPost[2];
 
 //====================================================================
 // Notifications
-extern NSString* GSWNotification__SessionDidTimeOutNotification[2];
+GSWEB_EXPORT NSString* GSWNotification__SessionDidTimeOutNotification[2];
 
 //====================================================================
 // Frameworks
 
 #if !GSWEB_STRICT
-	extern NSString* GSWFramework_all;
+	GSWEB_EXPORT NSString* GSWFramework_all;
 #endif
-extern NSString* GSWFramework_app;
-extern NSString* GSWFramework_extensions[2];
+GSWEB_EXPORT NSString* GSWFramework_app;
+GSWEB_EXPORT NSString* GSWFramework_extensions[2];
 
 //====================================================================
 // Protocols
 
-extern NSString* GSWProtocol_HTTP;
-extern NSString* GSWProtocol_HTTPS;
+GSWEB_EXPORT NSString* GSWProtocol_HTTP;
+GSWEB_EXPORT NSString* GSWProtocol_HTTPS;
 
 //====================================================================
 // Option Names
 
-extern NSString* GSWOPT_Adaptor[2];
-extern NSString* GSWOPT_Context[2];
-extern NSString* GSWOPT_Response[2];
-extern NSString* GSWOPT_Request[2];
-extern NSString* GSWOPT_AdditionalAdaptors[2];
-extern NSString* GSWOPT_ApplicationBaseURL[2];
-extern NSString* GSWOPT_AutoOpenInBrowser[2];
-extern NSString* GSWOPT_CGIAdaptorURL[2];
-extern NSString* GSWOPT_CachingEnabled[2];
-extern NSString* GSWOPT_ComponentRequestHandlerKey[2];
-extern NSString* GSWOPT_DebuggingEnabled[2];
-extern NSString* GSWOPT_StatusDebuggingEnabled[2];
-extern NSString* GSWOPT_DirectActionRequestHandlerKey[2];
-extern NSString* GSWOPT_DirectConnectEnabled[2];
-extern NSString* GSWOPT_FrameworksBaseURL[2];
-extern NSString* GSWOPT_OutputPath[2];
-extern NSString* GSWOPT_IncludeCommentsInResponse[2];
-extern NSString* GSWOPT_ListenQueueSize[2];
-extern NSString* GSWOPT_LoadFrameworks[2];
-extern NSString* GSWOPT_LifebeatEnabled[2];
-extern NSString* GSWOPT_LifebeatDestinationHost[2];
-extern NSString* GSWOPT_LifebeatDestinationPort[2];
-extern NSString* GSWOPT_LifebeatInterval[2];
-extern NSString* GSWOPT_MonitorEnabled[2];
-extern NSString* GSWOPT_MonitorHost[2];
-extern NSString* GSWOPT_Port[2];
-extern NSString* GSWOPT_Host[2];
-extern NSString* GSWOPT_ResourceRequestHandlerKey[2];
-extern NSString* GSWOPT_StreamActionRequestHandlerKey[2];
-extern NSString* GSWOPT_PingActionRequestHandlerKey[2];
-extern NSString* GSWOPT_StaticResourceRequestHandlerKey[2];
-extern NSString* GSWOPT_SMTPHost[2];
-extern NSString* GSWOPT_SessionTimeOut[2];
-extern NSString* GSWOPT_DefaultUndoStackLimit[2];
-extern NSString* GSWOPT_LockDefaultEditingContext[2];
-extern NSString* GSWOPT_WorkerThreadCount[2];
-extern NSString* GSWOPT_WorkerThreadCountMin[2];
-extern NSString* GSWOPT_WorkerThreadCountMax[2];
-extern NSString* GSWOPT_ProjectSearchPath;
-extern NSString* GSWOPT_MultiThreadEnabled;
-extern NSString* GSWOPT_DebugSetConfigFilePath;
-extern NSString* GSWOPT_AdaptorHost[2];
-extern NSString* GSWOPT_RecordingPath[2];
-extern NSString* GSWOPT_DefaultTemplateParser[2];
-extern NSString* GSWOPT_AcceptedContentEncoding[2];
-extern NSString* GSWOPT_SessionStoreClassName[2];
-extern NSString* GSWOPT_ResourceManagerClassName[2];
-extern NSString* GSWOPT_StatisticsStoreClassName[2];
-extern NSString* GSWOPT_RecordingClassName[2];
-extern NSString* GSWOPT_DisplayExceptionPages[2];
-extern NSString* GSWOPT_AllowsCacheControlHeader[2];
+GSWEB_EXPORT NSString* GSWOPT_Adaptor[2];
+GSWEB_EXPORT NSString* GSWOPT_Context[2];
+GSWEB_EXPORT NSString* GSWOPT_Response[2];
+GSWEB_EXPORT NSString* GSWOPT_Request[2];
+GSWEB_EXPORT NSString* GSWOPT_AdditionalAdaptors[2];
+GSWEB_EXPORT NSString* GSWOPT_ApplicationBaseURL[2];
+GSWEB_EXPORT NSString* GSWOPT_AutoOpenInBrowser[2];
+GSWEB_EXPORT NSString* GSWOPT_CGIAdaptorURL[2];
+GSWEB_EXPORT NSString* GSWOPT_CachingEnabled[2];
+GSWEB_EXPORT NSString* GSWOPT_ComponentRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPT_DebuggingEnabled[2];
+GSWEB_EXPORT NSString* GSWOPT_StatusDebuggingEnabled[2];
+GSWEB_EXPORT NSString* GSWOPT_DirectActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPT_DirectConnectEnabled[2];
+GSWEB_EXPORT NSString* GSWOPT_FrameworksBaseURL[2];
+GSWEB_EXPORT NSString* GSWOPT_OutputPath[2];
+GSWEB_EXPORT NSString* GSWOPT_IncludeCommentsInResponse[2];
+GSWEB_EXPORT NSString* GSWOPT_ListenQueueSize[2];
+GSWEB_EXPORT NSString* GSWOPT_LoadFrameworks[2];
+GSWEB_EXPORT NSString* GSWOPT_LifebeatEnabled[2];
+GSWEB_EXPORT NSString* GSWOPT_LifebeatDestinationHost[2];
+GSWEB_EXPORT NSString* GSWOPT_LifebeatDestinationPort[2];
+GSWEB_EXPORT NSString* GSWOPT_LifebeatInterval[2];
+GSWEB_EXPORT NSString* GSWOPT_MonitorEnabled[2];
+GSWEB_EXPORT NSString* GSWOPT_MonitorHost[2];
+GSWEB_EXPORT NSString* GSWOPT_Port[2];
+GSWEB_EXPORT NSString* GSWOPT_Host[2];
+GSWEB_EXPORT NSString* GSWOPT_ResourceRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPT_StreamActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPT_PingActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPT_StaticResourceRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPT_SMTPHost[2];
+GSWEB_EXPORT NSString* GSWOPT_SessionTimeOut[2];
+GSWEB_EXPORT NSString* GSWOPT_DefaultUndoStackLimit[2];
+GSWEB_EXPORT NSString* GSWOPT_LockDefaultEditingContext[2];
+GSWEB_EXPORT NSString* GSWOPT_WorkerThreadCount[2];
+GSWEB_EXPORT NSString* GSWOPT_WorkerThreadCountMin[2];
+GSWEB_EXPORT NSString* GSWOPT_WorkerThreadCountMax[2];
+GSWEB_EXPORT NSString* GSWOPT_ProjectSearchPath;
+GSWEB_EXPORT NSString* GSWOPT_MultiThreadEnabled;
+GSWEB_EXPORT NSString* GSWOPT_DebugSetConfigFilePath;
+GSWEB_EXPORT NSString* GSWOPT_AdaptorHost[2];
+GSWEB_EXPORT NSString* GSWOPT_RecordingPath[2];
+GSWEB_EXPORT NSString* GSWOPT_DefaultTemplateParser[2];
+GSWEB_EXPORT NSString* GSWOPT_AcceptedContentEncoding[2];
+GSWEB_EXPORT NSString* GSWOPT_SessionStoreClassName[2];
+GSWEB_EXPORT NSString* GSWOPT_ResourceManagerClassName[2];
+GSWEB_EXPORT NSString* GSWOPT_StatisticsStoreClassName[2];
+GSWEB_EXPORT NSString* GSWOPT_RecordingClassName[2];
+GSWEB_EXPORT NSString* GSWOPT_DisplayExceptionPages[2];
+GSWEB_EXPORT NSString* GSWOPT_AllowsCacheControlHeader[2];
 
 
 
 //====================================================================
 // Option Values
 
-extern NSString* GSWOPTValue_DefaultTemplateParser_XMLHTML;
-extern NSString* GSWOPTValue_DefaultTemplateParser_XMLHTMLNoOmittedTags;
-extern NSString* GSWOPTValue_DefaultTemplateParser_XML;
-extern NSString* GSWOPTValue_DefaultTemplateParser_ANTLR;
-extern NSString* GSWOPTValue_DefaultTemplateParser_RawHTML;
-extern NSString* GSWOPTValue_ComponentRequestHandlerKey[2];
-extern NSString* GSWOPTValue_ResourceRequestHandlerKey[2];
-extern NSString* GSWOPTValue_DirectActionRequestHandlerKey[2];
-extern NSString* GSWOPTValue_StreamActionRequestHandlerKey[2];
-extern NSString* GSWOPTValue_PingActionRequestHandlerKey[2];
-extern NSString* GSWOPTValue_StaticResourceRequestHandlerKey[2];
-extern NSString* GSWOPTValue_SessionStoreClassName[2];
+GSWEB_EXPORT NSString* GSWOPTValue_DefaultTemplateParser_XMLHTML;
+GSWEB_EXPORT NSString* GSWOPTValue_DefaultTemplateParser_XMLHTMLNoOmittedTags;
+GSWEB_EXPORT NSString* GSWOPTValue_DefaultTemplateParser_XML;
+GSWEB_EXPORT NSString* GSWOPTValue_DefaultTemplateParser_ANTLR;
+GSWEB_EXPORT NSString* GSWOPTValue_DefaultTemplateParser_RawHTML;
+GSWEB_EXPORT NSString* GSWOPTValue_ComponentRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPTValue_ResourceRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPTValue_DirectActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPTValue_StreamActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPTValue_PingActionRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPTValue_StaticResourceRequestHandlerKey[2];
+GSWEB_EXPORT NSString* GSWOPTValue_SessionStoreClassName[2];
 
 //====================================================================
 // Cache Marker
 
-extern NSString* GSNotFoundMarker;
-extern NSString* GSFoundMarker;
+GSWEB_EXPORT NSString* GSNotFoundMarker;
+GSWEB_EXPORT NSString* GSFoundMarker;
 
 //====================================================================
 // GSWAssociation special keys
 
-extern NSString* GSASK_Field;
-extern NSString* GSASK_FieldValidate;
-extern NSString* GSASK_FieldTitle;
-extern NSString* GSASK_Class;
-extern NSString* GSASK_Language;
+GSWEB_EXPORT NSString* GSASK_Field;
+GSWEB_EXPORT NSString* GSASK_FieldValidate;
+GSWEB_EXPORT NSString* GSASK_FieldTitle;
+GSWEB_EXPORT NSString* GSASK_Class;
+GSWEB_EXPORT NSString* GSASK_Language;
 
 //====================================================================
 // Page names
 
-extern NSString* GSWSessionRestorationErrorPageName[2];
-extern NSString* GSWSessionCreationErrorPageName[2];
-extern NSString* GSWExceptionPageName[2];
-extern NSString* GSWPageRestorationErrorPageName[2];
+GSWEB_EXPORT NSString* GSWSessionRestorationErrorPageName[2];
+GSWEB_EXPORT NSString* GSWSessionCreationErrorPageName[2];
+GSWEB_EXPORT NSString* GSWExceptionPageName[2];
+GSWEB_EXPORT NSString* GSWPageRestorationErrorPageName[2];
 
 //====================================================================
 // Thread Keys
 
-extern NSString* GSWThreadKey_ComponentDefinition;
-extern NSString* GSWThreadKey_DefaultAdaptorThread;
-extern NSString* GSWThreadKey_Context;
+GSWEB_EXPORT NSString* GSWThreadKey_ComponentDefinition;
+GSWEB_EXPORT NSString* GSWThreadKey_DefaultAdaptorThread;
+GSWEB_EXPORT NSString* GSWThreadKey_Context;
 
 //====================================================================
 // Tag Name
 
-extern NSString* GSWTag_Name[2];
+GSWEB_EXPORT NSString* GSWTag_Name[2];
 
 //====================================================================
 // Components Keys
 
-extern id value__Key;
-extern id action__Key;
-extern id name__Key;
-extern id disabled__Key;
-extern id dateFormat__Key;
-extern id numberFormat__Key;
-extern id href__Key;
-extern id queryDictionary__Key;
-extern id multipleSubmit__Key;
-extern id src__Key;
-extern id filename__Key;
-extern id framework__Key;
-extern id imageMapFileName__Key;
-extern id x__Key;
-extern id y__Key;
-extern id target__Key;
-extern id code__Key;
-extern id width__Key;
-extern id height__Key;
-extern id associationClass__Key;
-extern id codeBase__Key;
-extern id archive__Key;
-extern id archiveNames__Key;
-extern id object__Key;
-extern id hspace__Key;
-extern id vspace__Key;
-extern id align__Key;
-extern id list__Key;
-extern id sublist__Key;
-extern id item__Key;
-extern id selections__Key;
-extern id multiple__Key;
-extern id size__Key;
-extern id selection__Key;
-extern id checked__Key;
-extern id condition__Key;
-extern id conditionValue__Key;
-extern id negate__Key;
-extern id pageName__Key;
-extern id elementName__Key;
-extern id fragmentIdentifier__Key;
-extern id secure__Key;
-extern id string__Key;
-extern id scriptFile__Key;
-extern id scriptString__Key;
-extern id scriptSource__Key;
-extern id hideInComment__Key;
-extern id index__Key;
-extern id identifier__Key;
-extern id count__Key;
-extern id escapeHTML__Key;
-extern id GSWComponentName__Key[2];
-extern id componentName__Key;
-extern id prefix__Key;
-extern id suffix__Key;
-extern id level__Key;
-extern id isOrdered__Key;
-extern id useDecimalNumber__Key;
-extern id formatter__Key;
-extern id actionClass__Key;
-extern id directActionName__Key;
-extern id file__Key;
-extern id data__Key;
-extern id mimeType__Key;
-extern id key__Key;
-extern id selectedValue__Key;
-extern id noSelectionString__Key;
-extern id displayString__Key;
-extern id filePath__Key;
-extern id language__Key;
-extern id omitTags__Key;
-extern id formValue__Key;
-extern id formValues__Key;
-extern id invokeAction__Key;
-extern id elementID__Key;
-extern id otherTagString__Key;
+GSWEB_EXPORT id value__Key;
+GSWEB_EXPORT id action__Key;
+GSWEB_EXPORT id name__Key;
+GSWEB_EXPORT id disabled__Key;
+GSWEB_EXPORT id dateFormat__Key;
+GSWEB_EXPORT id numberFormat__Key;
+GSWEB_EXPORT id href__Key;
+GSWEB_EXPORT id queryDictionary__Key;
+GSWEB_EXPORT id multipleSubmit__Key;
+GSWEB_EXPORT id src__Key;
+GSWEB_EXPORT id filename__Key;
+GSWEB_EXPORT id framework__Key;
+GSWEB_EXPORT id imageMapFileName__Key;
+GSWEB_EXPORT id x__Key;
+GSWEB_EXPORT id y__Key;
+GSWEB_EXPORT id target__Key;
+GSWEB_EXPORT id code__Key;
+GSWEB_EXPORT id width__Key;
+GSWEB_EXPORT id height__Key;
+GSWEB_EXPORT id associationClass__Key;
+GSWEB_EXPORT id codeBase__Key;
+GSWEB_EXPORT id archive__Key;
+GSWEB_EXPORT id archiveNames__Key;
+GSWEB_EXPORT id object__Key;
+GSWEB_EXPORT id hspace__Key;
+GSWEB_EXPORT id vspace__Key;
+GSWEB_EXPORT id align__Key;
+GSWEB_EXPORT id list__Key;
+GSWEB_EXPORT id sublist__Key;
+GSWEB_EXPORT id item__Key;
+GSWEB_EXPORT id selections__Key;
+GSWEB_EXPORT id multiple__Key;
+GSWEB_EXPORT id size__Key;
+GSWEB_EXPORT id selection__Key;
+GSWEB_EXPORT id checked__Key;
+GSWEB_EXPORT id condition__Key;
+GSWEB_EXPORT id conditionValue__Key;
+GSWEB_EXPORT id negate__Key;
+GSWEB_EXPORT id pageName__Key;
+GSWEB_EXPORT id elementName__Key;
+GSWEB_EXPORT id fragmentIdentifier__Key;
+GSWEB_EXPORT id secure__Key;
+GSWEB_EXPORT id string__Key;
+GSWEB_EXPORT id scriptFile__Key;
+GSWEB_EXPORT id scriptString__Key;
+GSWEB_EXPORT id scriptSource__Key;
+GSWEB_EXPORT id hideInComment__Key;
+GSWEB_EXPORT id index__Key;
+GSWEB_EXPORT id identifier__Key;
+GSWEB_EXPORT id count__Key;
+GSWEB_EXPORT id escapeHTML__Key;
+GSWEB_EXPORT id GSWComponentName__Key[2];
+GSWEB_EXPORT id componentName__Key;
+GSWEB_EXPORT id prefix__Key;
+GSWEB_EXPORT id suffix__Key;
+GSWEB_EXPORT id level__Key;
+GSWEB_EXPORT id isOrdered__Key;
+GSWEB_EXPORT id useDecimalNumber__Key;
+GSWEB_EXPORT id formatter__Key;
+GSWEB_EXPORT id actionClass__Key;
+GSWEB_EXPORT id directActionName__Key;
+GSWEB_EXPORT id file__Key;
+GSWEB_EXPORT id data__Key;
+GSWEB_EXPORT id mimeType__Key;
+GSWEB_EXPORT id key__Key;
+GSWEB_EXPORT id selectedValue__Key;
+GSWEB_EXPORT id noSelectionString__Key;
+GSWEB_EXPORT id displayString__Key;
+GSWEB_EXPORT id filePath__Key;
+GSWEB_EXPORT id language__Key;
+GSWEB_EXPORT id omitTags__Key;
+GSWEB_EXPORT id formValue__Key;
+GSWEB_EXPORT id formValues__Key;
+GSWEB_EXPORT id invokeAction__Key;
+GSWEB_EXPORT id elementID__Key;
+GSWEB_EXPORT id otherTagString__Key;
 
 //GSWeb Additions
-extern id redirectURL__Key;
-extern id displayDisabled__Key;
-extern id actionYes__Key;
-extern id actionNo__Key;
-extern id pageSetVar__Prefix__Key;
-extern id pageSetVars__Key;
-extern id selectionValue__Key;
-extern id selectionValues__Key;
-extern id enabled__Key;
-extern id convertHTML__Key;
-extern id convertHTMLEntities__Key;
-extern id componentDesign__Key;
-extern id pageDesign__Key;
-extern id imageMapString__Key;
-extern id imageMapRegions__Key;
-extern id handleValidationException__Key;
-extern id selectedValues__Key;
-extern id startIndex__Key;
-extern id stopIndex__Key;
-extern id cidStore__Key;
-extern id cidKey__Key;
-extern id isDisplayStringBefore__Key;
-extern id urlPrefix__Key;
-extern id pathQueryDictionary__Key;
+GSWEB_EXPORT id redirectURL__Key;
+GSWEB_EXPORT id displayDisabled__Key;
+GSWEB_EXPORT id actionYes__Key;
+GSWEB_EXPORT id actionNo__Key;
+GSWEB_EXPORT id pageSetVar__Prefix__Key;
+GSWEB_EXPORT id pageSetVars__Key;
+GSWEB_EXPORT id selectionValue__Key;
+GSWEB_EXPORT id selectionValues__Key;
+GSWEB_EXPORT id enabled__Key;
+GSWEB_EXPORT id convertHTML__Key;
+GSWEB_EXPORT id convertHTMLEntities__Key;
+GSWEB_EXPORT id componentDesign__Key;
+GSWEB_EXPORT id pageDesign__Key;
+GSWEB_EXPORT id imageMapString__Key;
+GSWEB_EXPORT id imageMapRegions__Key;
+GSWEB_EXPORT id handleValidationException__Key;
+GSWEB_EXPORT id selectedValues__Key;
+GSWEB_EXPORT id startIndex__Key;
+GSWEB_EXPORT id stopIndex__Key;
+GSWEB_EXPORT id cidStore__Key;
+GSWEB_EXPORT id cidKey__Key;
+GSWEB_EXPORT id isDisplayStringBefore__Key;
+GSWEB_EXPORT id urlPrefix__Key;
+GSWEB_EXPORT id pathQueryDictionary__Key;
 
 #endif // _GSWebConstants_h__
 
diff --git a/GSWeb.framework/GSWDebug.h b/GSWeb.framework/GSWDebug.h
index a8724c2..2709108 100644
--- a/GSWeb.framework/GSWDebug.h
+++ b/GSWeb.framework/GSWDebug.h
@@ -27,21 +27,34 @@
 #define _GSWebDebug_h__
 
 #ifdef DEBUG
-extern NSString* GSWDebugMethodMsg(id obj, SEL sel, const char *file, int line, NSString *fmt);
-extern void GSWLogC_(CONST char* file,int line,CONST char* string);
-extern void GSWLogDumpObjectFn(CONST char* file,int line,id object,int deep);
-extern void GSWLogAssertGoodFn(CONST char* file,int line,id object);
+GSWEB_EXPORT NSString *
+GSWDebugMethodMsg(id obj, SEL sel, const char *file, int line, NSString *fmt);
+
+GSWEB_EXPORT void
+GSWLogC_(CONST char* file,int line,CONST char* string);
+
+GSWEB_EXPORT void
+GSWLogDumpObjectFn(CONST char* file,int line,id object,int deep);
+
+GSWEB_EXPORT void
+GSWLogAssertGoodFn(CONST char* file,int line,id object);
 #endif
 #ifdef GSWDEBUG
 
-#define GSWLogC(cString);				GSWLogC_(__FILE__,__LINE__,cString);
-#define GSWLogDumpObject(object,deep); 	GSWLogDumpObjectFn(__FILE__,__LINE__,object,deep);
-#define GSWLogAssertGood(object); 		GSWLogAssertGoodFn(__FILE__,__LINE__,object);
+#define GSWLogC(cString);	\
+	GSWLogC_(__FILE__, __LINE__, cString);
+#define GSWLogDumpObject(object, deep);	\
+	GSWLogDumpObjectFn(__FILE__, __LINE__, object, deep);
+#define GSWLogAssertGood(object);	\
+	GSWLogAssertGoodFn(__FILE__, __LINE__, object);
 
 //Log Memory Alloc/Dealloc
 #ifdef GSWDEBUG_MEM
-#define GSWLogMemC(cString);				GSWLogC_(__FILE__,__LINE__,cString);
-#define GSWLogMemCF(format, args...);			{ fprintf(stderr,"File %s: %d. ",file,line); fprintf(stderr,format, ## args); };
+#define GSWLogMemC(cString);	\
+	GSWLogC_(__FILE__,__LINE__,cString);
+#define GSWLogMemCF(format, args...);	\
+	{ fprintf(stderr,"File %s: %d. ",file,line);	\
+	  fprintf(stderr,format, ## args); };
 #else
 #define GSWLogMemC(cString);				
 #define GSWLogMemCF(format, args...);
@@ -49,14 +62,16 @@ extern void GSWLogAssertGoodFn(CONST char* file,int line,id object);
 
 //Log Locks
 #ifdef GSWDEBUG_LOCK
-#define GSWLogLockC(cString);				GSWLogC_(__FILE__,__LINE__,cString);
+#define GSWLogLockC(cString);	\
+	GSWLogC_(__FILE__, __LINE__, cString);
 #else
 #define GSWLogLockC(cString);				
 #endif
 
 //Log Locks
 #ifdef GSWDEBUG_DEEP
-#define GSWLogDeepC(cString);				GSWLogC_(__FILE__,__LINE__,cString);
+#define GSWLogDeepC(cString);	\
+	GSWLogC_(__FILE__, __LINE__, cString);
 #else
 #define GSWLogDeepC(cString);				
 #endif
@@ -76,132 +91,160 @@ extern void GSWLogAssertGoodFn(CONST char* file,int line,id object);
 
 #define LOGClassFnStart()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGClassFnStop()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,__FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGClassFnStartC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGClassFnStopC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGClassFnStartCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGClassFnStopCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGClassFnStartCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGClassFnStopCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGObjectFnStart()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGObjectFnStop()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGObjectFnStartC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGObjectFnStopC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGObjectFnStartCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGObjectFnStopCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGObjectFnStartCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGObjectFnStopCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGObjectFnNotImplemented()	  \
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__,	\
+				      @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGClassFnNotImplemented() 	\
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__,	\
+				       @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGClassFnNotImplemented() 	\
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__,	\
+				       @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGSeriousError(format, args...) 	\
   do { if (GSDebugSet(@"seriousError") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*SERIOUS ERROR*: %@",fmt]; \
     NSLog(fmt2, ## args); }} while (0)
 
 #define LOGSeriousError0(format) 	\
   do { if (GSDebugSet(@"seriousError") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*SERIOUS ERROR*: %@",fmt]; \
 	NSLog(@"%@",fmt2); }} while (0)
 
 #define LOGException(format, args...) 	\
   do { /*if (GSDebugSet(@"exception") == YES)*/ { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \
     NSLog(fmt2, ## args); }} while (0)
 
 #define LOGException0(format) 	\
   do { /*if (GSDebugSet(@"exception") == YES)*/ { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \
 	NSLog(@"%@",fmt2); }} while (0)
 
 #define LOGError(format, args...) 	\
   do { if (GSDebugSet(@"error") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*ERROR*: %@",fmt]; \
     NSLog(fmt2, ## args);}} while (0)
 
 #define LOGError0(format) 	\
   do { if (GSDebugSet(@"error") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*ERROR*: %@",fmt]; \
     NSLog(@"%@",fmt2); }} while (0)
 
@@ -278,132 +321,160 @@ extern void GSWLogAssertGoodFn(CONST char* file,int line,id object);
 #if defined(DEBUG) && defined(GSWDEBUG_DEEP)
 #define LOGDEEPClassFnStart()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,
+				       __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPClassFnStop()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,__FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPClassFnStartC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPClassFnStopC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPClassFnStartCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				        __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPClassFnStopCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPClassFnStartCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPClassFnStopCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPObjectFnStart()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPObjectFnStop()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPObjectFnStartC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPObjectFnStopC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPObjectFnStartCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPObjectFnStopCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				       __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPObjectFnStartCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPObjectFnStopCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGDEEPObjectFnNotImplemented()	  \
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__,	\
+				      @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPClassFnNotImplemented() 	\
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__,	\
+				       @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPClassFnNotImplemented() 	\
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__,	\
+				       @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGDEEPSeriousError(format, args...) 	\
   do { if (GSDebugSet(@"seriousError") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*SERIOUS ERROR*: %@",fmt]; \
     NSLog(fmt2, ## args); }} while (0)
 
 #define LOGDEEPSeriousError0(format) 	\
   do { if (GSDebugSet(@"seriousError") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*SERIOUS ERROR*: %@",fmt]; \
 	NSLog(@"%@",fmt2); }} while (0)
 
 #define LOGDEEPException(format, args...) 	\
   do { if (GSDebugSet(@"exception") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \
     NSLog(fmt2, ## args); }} while (0)
 
 #define LOGDEEPException0(format) 	\
   do { if (GSDebugSet(@"exception") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \
 	NSLog(@"%@",fmt2); }} while (0)
 
 #define LOGDEEPError(format, args...) 	\
   do { if (GSDebugSet(@"error") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__,format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*ERROR*: %@",fmt]; \
     NSLog(fmt2, ## args);}} while (0)
 
 #define LOGDEEPError0(format) 	\
   do { if (GSDebugSet(@"error") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*ERROR*: %@",fmt]; \
     NSLog(@"%@",fmt2); }} while (0)
 
@@ -494,132 +565,160 @@ extern void GSWLogAssertGoodFn(CONST char* file,int line,id object);
 #if defined(DEBUG) && (defined(GSWDEBUG_DEEP) || defined (GSWDEBUG_LOCK))
 #define LOGLOCKClassFnStart()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKClassFnStop()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,__FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKClassFnStartC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKClassFnStopC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKClassFnStartCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKClassFnStopCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKClassFnStartCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKClassFnStopCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKObjectFnStart()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKObjectFnStop()  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKObjectFnStartC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKObjectFnStopC(comment)  \
   do { if (GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKObjectFnStartCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKObjectFnStopCond(cond)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKObjectFnStartCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTART %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKObjectFnStopCondC(cond,comment)  \
   do { if (cond && GSDebugSet(@"GSWebFn") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP %s"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__, @"FNSTOP %s"); \
     NSLog(fmt,comment); }} while (0)
 
 #define LOGLOCKObjectFnNotImplemented()	  \
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSWDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSWDebugMethodMsg(self, _cmd,	\
+				      __FILE__, __LINE__,	\
+				      @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKClassFnNotImplemented() 	\
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__,	\
+				       @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKClassFnNotImplemented() 	\
   do { if (GSDebugSet(@"dflt") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__,	\
+				       @"NOT IMPLEMENTED"); \
     NSLog(fmt); }} while (0)
 
 #define LOGLOCKSeriousError(format, args...) 	\
   do { if (GSDebugSet(@"seriousError") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*SERIOUS ERROR*: %@",fmt]; \
     NSLog(fmt2, ## args); }} while (0)
 
 #define LOGLOCKSeriousError0(format) 	\
   do { if (GSDebugSet(@"seriousError") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*SERIOUS ERROR*: %@",fmt]; \
 	NSLog(@"%@",fmt2); }} while (0)
 
 #define LOGLOCKException(format, args...) 	\
   do { if (GSDebugSet(@"exception") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \
     NSLog(fmt2, ## args); }} while (0)
 
 #define LOGLOCKException0(format) 	\
   do { if (GSDebugSet(@"exception") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*EXCEPTION*: %@",fmt]; \
 	NSLog(@"%@",fmt2); }} while (0)
 
 #define LOGLOCKError(format, args...) 	\
   do { if (GSDebugSet(@"error") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*ERROR*: %@",fmt]; \
     NSLog(fmt2, ## args);}} while (0)
 
 #define LOGLOCKError0(format) 	\
   do { if (GSDebugSet(@"error") == YES) { \
-    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,format); \
+    NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,	\
+				       __FILE__, __LINE__, format); \
     NSString *fmt2 = [NSString stringWithFormat:@"*ERROR*: %@",fmt]; \
     NSLog(@"%@",fmt2); }} while (0)
 
diff --git a/GSWeb.framework/GSWDefaultAdaptor.h b/GSWeb.framework/GSWDefaultAdaptor.h
index 18d6179..fa177a8 100644
--- a/GSWeb.framework/GSWDefaultAdaptor.h
+++ b/GSWeb.framework/GSWDefaultAdaptor.h
@@ -27,7 +27,7 @@
 #ifndef _GSWDefaultAdaptor_h__
 	#define _GSWDefaultAdaptor_h__
 
-extern int iBlock;
+GSWEB_EXPORT int iBlock;
 //====================================================================
 // GSWDefaultAdaptor
 
diff --git a/GSWeb.framework/GSWDefines.h b/GSWeb.framework/GSWDefines.h
new file mode 100644
index 0000000..892363f
--- /dev/null
+++ b/GSWeb.framework/GSWDefines.h
@@ -0,0 +1,48 @@
+/* -*-objc-*-
+   GSWDefines.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: Sung Jin Chun <chunsj@embian.com>
+
+   This file is part of the GNUstepWeb Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef __GSWeb_GSWDefines_h__
+#define __GSWeb_GSWDefines_h__
+
+#ifdef GNUSTEP_WITH_DLL
+
+#if BUILD_GSWeb_DLL
+#  define GSWEB_EXPORT  __declspec(dllexport)
+#  define GSWEB_DECLARE __declspec(dllexport) 
+#else
+#  define GSWEB_EXPORT  extern __declspec(dllimport)
+#  define GSWEB_DECLARE __declspec(dllimport) 
+#endif
+
+#else /* GNUSTEP_WITH[OUT]_DLL */
+
+#  define GSWEB_EXPORT extern
+#  define GSWEB_DECLARE 
+
+#endif
+
+
+#endif /* __GSWeb_GSWDefines_h__ */
+
diff --git a/GSWeb.framework/GSWElement.h b/GSWeb.framework/GSWElement.h
index 716ce1c..aa18528 100644
--- a/GSWeb.framework/GSWElement.h
+++ b/GSWeb.framework/GSWElement.h
@@ -32,10 +32,10 @@
 #ifndef _GSWElement_h__
 	#define _GSWElement_h__
 
-extern BYTE ElementsMap_htmlBareString;
-extern BYTE ElementsMap_gswebElement;
-extern BYTE ElementsMap_dynamicElement;
-extern BYTE ElementsMap_attributeElement;
+GSWEB_EXPORT BYTE ElementsMap_htmlBareString;
+GSWEB_EXPORT BYTE ElementsMap_gswebElement;
+GSWEB_EXPORT BYTE ElementsMap_dynamicElement;
+GSWEB_EXPORT BYTE ElementsMap_attributeElement;
 
 
 //====================================================================
diff --git a/GSWeb.framework/GSWHTMLAttrLexer.h b/GSWeb.framework/GSWHTMLAttrLexer.h
index 2d5de84..4a0df64 100644
--- a/GSWeb.framework/GSWHTMLAttrLexer.h
+++ b/GSWeb.framework/GSWHTMLAttrLexer.h
@@ -45,13 +45,13 @@
 
 
 
-extern CONST unsigned long GSWHTMLAttrLexer___tokenSet_0_data_[];
-extern ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_0;
-extern CONST unsigned long GSWHTMLAttrLexer___tokenSet_1_data_[];
-extern ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_1;
-extern CONST unsigned long GSWHTMLAttrLexer___tokenSet_2_data_[];
-extern ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_2;
-extern CONST unsigned long GSWHTMLAttrLexer___tokenSet_3_data_[];
-extern ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_3;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrLexer___tokenSet_0_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_0;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrLexer___tokenSet_1_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_1;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrLexer___tokenSet_2_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_2;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrLexer___tokenSet_3_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrLexer___tokenSet_3;
 
 #endif /*INC_GSWHTMLAttrLexer_h_*/
diff --git a/GSWeb.framework/GSWHTMLAttrParser.h b/GSWeb.framework/GSWHTMLAttrParser.h
index 54f490f..93716bd 100644
--- a/GSWeb.framework/GSWHTMLAttrParser.h
+++ b/GSWeb.framework/GSWHTMLAttrParser.h
@@ -40,21 +40,21 @@
 @end;
 
 
-extern CONST NSString* GSWHTMLAttrParser___tokenNames[];
+GSWEB_EXPORT CONST NSString* GSWHTMLAttrParser___tokenNames[];
 
-extern CONST unsigned long GSWHTMLAttrParser___tokenSet_0_data_[];
-extern ANTLRBitSet* GSWHTMLAttrParser___tokenSet_0;
-extern CONST unsigned long GSWHTMLAttrParser___tokenSet_1_data_[];
-extern ANTLRBitSet* GSWHTMLAttrParser___tokenSet_1;
-extern CONST unsigned long GSWHTMLAttrParser___tokenSet_2_data_[];
-extern ANTLRBitSet* GSWHTMLAttrParser___tokenSet_2;
-extern CONST unsigned long GSWHTMLAttrParser___tokenSet_3_data_[];
-extern ANTLRBitSet* GSWHTMLAttrParser___tokenSet_3;
-extern CONST unsigned long GSWHTMLAttrParser___tokenSet_4_data_[];
-extern ANTLRBitSet* GSWHTMLAttrParser___tokenSet_4;
-extern CONST unsigned long GSWHTMLAttrParser___tokenSet_5_data_[];
-extern ANTLRBitSet* GSWHTMLAttrParser___tokenSet_5;
-extern CONST unsigned long GSWHTMLAttrParser___tokenSet_6_data_[];
-extern ANTLRBitSet* GSWHTMLAttrParser___tokenSet_6;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrParser___tokenSet_0_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrParser___tokenSet_0;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrParser___tokenSet_1_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrParser___tokenSet_1;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrParser___tokenSet_2_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrParser___tokenSet_2;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrParser___tokenSet_3_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrParser___tokenSet_3;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrParser___tokenSet_4_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrParser___tokenSet_4;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrParser___tokenSet_5_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrParser___tokenSet_5;
+GSWEB_EXPORT CONST unsigned long GSWHTMLAttrParser___tokenSet_6_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLAttrParser___tokenSet_6;
 
 #endif /*INC_GSWHTMLAttrParser_h_*/
diff --git a/GSWeb.framework/GSWHTMLLexer.h b/GSWeb.framework/GSWHTMLLexer.h
index e352a9d..0d8da25 100644
--- a/GSWeb.framework/GSWHTMLLexer.h
+++ b/GSWeb.framework/GSWHTMLLexer.h
@@ -52,39 +52,39 @@
 
 
 
-extern CONST unsigned long GSWHTMLLexer___tokenSet_0_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_0;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_1_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_1;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_2_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_2;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_3_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_3;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_4_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_4;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_5_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_5;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_6_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_6;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_7_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_7;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_8_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_8;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_9_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_9;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_10_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_10;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_11_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_11;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_12_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_12;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_13_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_13;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_14_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_14;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_15_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_15;
-extern CONST unsigned long GSWHTMLLexer___tokenSet_16_data_[];
-extern ANTLRBitSet* GSWHTMLLexer___tokenSet_16;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_0_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_0;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_1_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_1;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_2_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_2;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_3_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_3;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_4_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_4;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_5_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_5;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_6_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_6;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_7_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_7;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_8_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_8;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_9_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_9;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_10_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_10;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_11_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_11;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_12_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_12;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_13_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_13;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_14_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_14;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_15_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_15;
+GSWEB_EXPORT CONST unsigned long GSWHTMLLexer___tokenSet_16_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLLexer___tokenSet_16;
 
 #endif /*INC_GSWHTMLLexer_h_*/
diff --git a/GSWeb.framework/GSWHTMLParser.h b/GSWeb.framework/GSWHTMLParser.h
index b76c1e0..e3e556d 100644
--- a/GSWeb.framework/GSWHTMLParser.h
+++ b/GSWeb.framework/GSWHTMLParser.h
@@ -34,9 +34,9 @@
 @end;
 
 
-extern CONST NSString* GSWHTMLParser___tokenNames[];
+GSWEB_EXPORT CONST NSString* GSWHTMLParser___tokenNames[];
 
-extern CONST unsigned long GSWHTMLParser___tokenSet_0_data_[];
-extern ANTLRBitSet* GSWHTMLParser___tokenSet_0;
+GSWEB_EXPORT CONST unsigned long GSWHTMLParser___tokenSet_0_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWHTMLParser___tokenSet_0;
 
 #endif /*INC_GSWHTMLParser_h_*/
diff --git a/GSWeb.framework/GSWPageDefLexer.h b/GSWeb.framework/GSWPageDefLexer.h
index be4608d..29c8aa0 100644
--- a/GSWeb.framework/GSWPageDefLexer.h
+++ b/GSWeb.framework/GSWPageDefLexer.h
@@ -60,23 +60,23 @@
 
 
 
-extern CONST unsigned long GSWPageDefLexer___tokenSet_0_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_0;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_1_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_1;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_2_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_2;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_3_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_3;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_4_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_4;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_5_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_5;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_6_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_6;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_7_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_7;
-extern CONST unsigned long GSWPageDefLexer___tokenSet_8_data_[];
-extern ANTLRBitSet* GSWPageDefLexer___tokenSet_8;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_0_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_0;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_1_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_1;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_2_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_2;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_3_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_3;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_4_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_4;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_5_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_5;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_6_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_6;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_7_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_7;
+GSWEB_EXPORT CONST unsigned long GSWPageDefLexer___tokenSet_8_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefLexer___tokenSet_8;
 
 #endif /*INC_GSWPageDefLexer_h_*/
diff --git a/GSWeb.framework/GSWPageDefParser.h b/GSWeb.framework/GSWPageDefParser.h
index a6e23ec..f28838a 100644
--- a/GSWeb.framework/GSWPageDefParser.h
+++ b/GSWeb.framework/GSWPageDefParser.h
@@ -47,21 +47,21 @@
 @end;
 
 
-extern CONST NSString* GSWPageDefParser___tokenNames[];
+GSWEB_EXPORT CONST NSString* GSWPageDefParser___tokenNames[];
 
-extern CONST unsigned long GSWPageDefParser___tokenSet_0_data_[];
-extern ANTLRBitSet* GSWPageDefParser___tokenSet_0;
-extern CONST unsigned long GSWPageDefParser___tokenSet_1_data_[];
-extern ANTLRBitSet* GSWPageDefParser___tokenSet_1;
-extern CONST unsigned long GSWPageDefParser___tokenSet_2_data_[];
-extern ANTLRBitSet* GSWPageDefParser___tokenSet_2;
-extern CONST unsigned long GSWPageDefParser___tokenSet_3_data_[];
-extern ANTLRBitSet* GSWPageDefParser___tokenSet_3;
-extern CONST unsigned long GSWPageDefParser___tokenSet_4_data_[];
-extern ANTLRBitSet* GSWPageDefParser___tokenSet_4;
-extern CONST unsigned long GSWPageDefParser___tokenSet_5_data_[];
-extern ANTLRBitSet* GSWPageDefParser___tokenSet_5;
-extern CONST unsigned long GSWPageDefParser___tokenSet_6_data_[];
-extern ANTLRBitSet* GSWPageDefParser___tokenSet_6;
+GSWEB_EXPORT CONST unsigned long GSWPageDefParser___tokenSet_0_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefParser___tokenSet_0;
+GSWEB_EXPORT CONST unsigned long GSWPageDefParser___tokenSet_1_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefParser___tokenSet_1;
+GSWEB_EXPORT CONST unsigned long GSWPageDefParser___tokenSet_2_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefParser___tokenSet_2;
+GSWEB_EXPORT CONST unsigned long GSWPageDefParser___tokenSet_3_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefParser___tokenSet_3;
+GSWEB_EXPORT CONST unsigned long GSWPageDefParser___tokenSet_4_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefParser___tokenSet_4;
+GSWEB_EXPORT CONST unsigned long GSWPageDefParser___tokenSet_5_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefParser___tokenSet_5;
+GSWEB_EXPORT CONST unsigned long GSWPageDefParser___tokenSet_6_data_[];
+GSWEB_EXPORT ANTLRBitSet* GSWPageDefParser___tokenSet_6;
 
 #endif /*INC_GSWPageDefParser_h_*/
diff --git a/GSWeb.framework/GSWResourceManager.h b/GSWeb.framework/GSWResourceManager.h
index 1c60295..8fe720d 100644
--- a/GSWeb.framework/GSWResourceManager.h
+++ b/GSWeb.framework/GSWResourceManager.h
@@ -33,7 +33,7 @@
 #ifndef _GSWResourceManager_h__
 	#define _GSWResourceManager_h__
 
-extern NSDictionary* globalMime;
+GSWEB_EXPORT NSDictionary* globalMime;
 
 //====================================================================
 @interface GSWResourceManager : NSObject <NSLocking>
diff --git a/GSWeb.framework/GSWUtils.h b/GSWeb.framework/GSWUtils.h
index 04f53ef..b8cedcd 100644
--- a/GSWeb.framework/GSWUtils.h
+++ b/GSWeb.framework/GSWUtils.h
@@ -66,31 +66,35 @@ typedef unsigned int UINT32;
 
 BOOL ClassIsKindOfClass(Class classA,Class classB);
 
-void ExceptionRaiseFn(const char *func, 
-		      const char *file,
-		      int line,
-		      NSString* name_,
-		      NSString* format_,
-		      ...);
-void ExceptionRaiseFn0(const char *func, 
-		       const char *file,
-		       int line,
-		       NSString* name_,
-		       NSString* format_);
+GSWEB_EXPORT void
+ExceptionRaiseFn(const char *func, 
+		 const char *file,
+		 int line,
+		 NSString* name_,
+		 NSString* format_,
+		 ...);
+GSWEB_EXPORT void
+ExceptionRaiseFn0(const char *func, 
+		  const char *file,
+		  int line,
+		  NSString* name_,
+		  NSString* format_);
 
-void ValidationExceptionRaiseFn(const char *func, 
-				const char *file,
-				int line,
-				NSString* name_,
-				NSString* message_,
-				NSString* format_,
-				...);
-void ValidationExceptionRaiseFn0(const char *func, 
-				 const char *file,
-				 int line,
-				 NSString* name_,
-				 NSString* message_,
-				 NSString* format_);
+GSWEB_EXPORT void
+ValidationExceptionRaiseFn(const char *func, 
+			   const char *file,
+			   int line,
+			   NSString* name_,
+			   NSString* message_,
+			   NSString* format_,
+			   ...);
+GSWEB_EXPORT void
+ValidationExceptionRaiseFn0(const char *func, 
+			    const char *file,
+			    int line,
+			    NSString* name_,
+			    NSString* message_,
+			    NSString* format_);
 
 #define ExceptionRaise(name_, format_, args...) \
   { ExceptionRaiseFn(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
@@ -108,17 +112,17 @@ void ValidationExceptionRaiseFn0(const char *func,
   { ValidationExceptionRaiseFn0(__PRETTY_FUNCTION__, __FILE__, __LINE__,\
                                 name_,message_,format_); }
 
-extern BOOL boolValueFor(id id_);
-extern BOOL boolValueWithDefaultFor(id id_,BOOL defaultValue);
-//extern BOOLNB boolNbFor(BOOL value_);
-extern BOOL isHeaderKeysEqual(NSString* headerKey,NSString* testKey);
-extern BOOL SBIsEqual(id id1,id id2);
-extern BOOL SBIsValueEqual(id id1,id id2);
-extern BOOL SBIsValueIsIn(id id1,id id2);
+GSWEB_EXPORT BOOL boolValueFor(id id_);
+GSWEB_EXPORT BOOL boolValueWithDefaultFor(id id_,BOOL defaultValue);
+//GSWEB_EXPORT BOOLNB boolNbFor(BOOL value_);
+GSWEB_EXPORT BOOL isHeaderKeysEqual(NSString* headerKey,NSString* testKey);
+GSWEB_EXPORT BOOL SBIsEqual(id id1,id id2);
+GSWEB_EXPORT BOOL SBIsValueEqual(id id1,id id2);
+GSWEB_EXPORT BOOL SBIsValueIsIn(id id1,id id2);
 
-extern id GetTmpName(NSString* dir,NSString* prefix);
-extern NSTimeInterval NSTimeIntervalFromTimeVal(struct timeval* tv);
-extern void NSTimeIntervalSleep(NSTimeInterval ti);
+GSWEB_EXPORT id GetTmpName(NSString* dir,NSString* prefix);
+GSWEB_EXPORT NSTimeInterval NSTimeIntervalFromTimeVal(struct timeval* tv);
+GSWEB_EXPORT void NSTimeIntervalSleep(NSTimeInterval ti);
 /* Basic data structure which holds all information we can get about a process.
  * (unless otherwise specified, fields are read from /proc/#/stat)
  */
@@ -181,12 +185,12 @@ typedef struct proc_s {
     struct proc_s *l,   /* ptrs for building arbitrary linked structs */
                   *r;   /* (i.e. singly/doubly-linked lists and trees */
 } proc_t;
-extern void pidstat(pid_t pid, proc_t* P);
-extern void pidstatm(pid_t pid, proc_t* P);
+GSWEB_EXPORT void pidstat(pid_t pid, proc_t* P);
+GSWEB_EXPORT void pidstatm(pid_t pid, proc_t* P);
 
 
 
-extern NSString* GSWGetDefaultDocRoot();
+GSWEB_EXPORT NSString* GSWGetDefaultDocRoot();
 
 //====================================================================
 @interface NSException (NSBuild)
@@ -320,14 +324,14 @@ extern NSString* GSWGetDefaultDocRoot();
   (loggedUnlockFromFunctionInFileInLine(__lock, \
      __FILE__, __PRETTY_FUNCTION__, __LINE__))
 
-extern BOOL
+GSWEB_EXPORT BOOL
 loggedLockBeforeDateFromFunctionInFileInLine(id self,
 					     BOOL try,
 					     NSDate *limit, 
 					     const char *file,
 					     const char *function,
 					     long line);
-extern void
+GSWEB_EXPORT void
 loggedUnlockFromFunctionInFileInLine(id self,
 				     const char *file,
 				     const char *function,
diff --git a/GSWeb.framework/GSWeb.h b/GSWeb.framework/GSWeb.h
index b56936e..32f189d 100644
--- a/GSWeb.framework/GSWeb.h
+++ b/GSWeb.framework/GSWeb.h
@@ -150,6 +150,7 @@
 @class GSWRecording;
 @class GSWInputStreamData;
 
+#include "GSWDefines.h"
 #include "GSWConstants.h"
 #include "GSWUtils.h"
 #include "GSWProcFS.h"