--- kdevelop-3.5.0/buildtools/lib/widgets/environmentdisplaydialog.cpp	2007-05-14 03:41:05.000000000 -0400
+++ kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp	2007-10-26 10:28:00.000000000 -0400
@@ -23,13 +23,21 @@
 
 #include "environmentdisplaydialog.h"
 
+#ifdef __APPLE__
+#include <crt_externs.h>
+#else
 extern char **environ;
+#endif
 
 EnvironmentDisplayDialog::EnvironmentDisplayDialog(QWidget* parent, const char* name, bool modal, WFlags fl)
 : EnvironmentDisplayDialogBase(parent,name, modal,fl)
 {
 	QStringList environment;
+#ifdef __APPLE__
+	char ** e = *_NSGetEnviron();
+#else
 	char ** e = ::environ;
+#endif
 	
 	while ( *e ) 
 	{
--- kdevelop-3.5.0/lib/cppparser/cachemanager.h	2007-05-14 03:41:12.000000000 -0400
+++ kdevelop-3.5.0-new/lib/cppparser/cachemanager.h	2007-10-26 10:29:47.000000000 -0400
@@ -18,6 +18,7 @@
 #include <cstdlib>
 #include <set>
 #include <limits>
+#include <sys/types.h>
 
 class CacheManager;