--- configure.in
+++ configure.in
@@ -268,7 +268,7 @@
 ]) ])
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(dirent.h fcntl.h fnmatch.h stat.h stdlib.h string.h)
+AC_CHECK_HEADERS(dirent.h fcntl.h fnmatch.h stat.h stdlib.h string.h stdint.h)
 AC_CHECK_HEADERS(time.h types.h unistd.h)
 AC_CHECK_HEADERS(sys/dir.h sys/stat.h sys/times.h sys/types.h)
 
--- scintilla/include/Scintilla.h
+++ scintilla/include/Scintilla.h
@@ -24,6 +24,11 @@
 #if _MSC_VER >= 1300
 #include <BaseTsd.h>
 #endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+typedef uintptr_t uptr_t;
+typedef intptr_t sptr_t;
+#else
 #ifdef MAXULONG_PTR
 typedef ULONG_PTR uptr_t;
 typedef LONG_PTR sptr_t;
@@ -31,6 +36,7 @@
 typedef unsigned long uptr_t;
 typedef long sptr_t;
 #endif
+#endif
 
 typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
--- src/anjuta.c
+++ src/anjuta.c
@@ -583,9 +583,9 @@
 	TextEditor *te;
 	guint *explorer_height;
 
-	g_return_val_if_fail (fname, NULL);
+	g_return_val_if_fail (fname, 0);
 	fn = anjuta_get_full_filename (fname);
-	g_return_val_if_fail (fname != NULL, NULL);
+	g_return_val_if_fail (fname != NULL, 0);
 
 	te = app->explorer_view;
 	if (te)
@@ -615,12 +615,12 @@
 			scintilla_send_message (SCINTILLA (te->widgets.editor),
 									SCI_SETSELECTIONEND, selpos, 0);
 			
-			explorer_height = scintilla_send_message (SCINTILLA (te->widgets.editor),
+			explorer_height = (guint *) scintilla_send_message (SCINTILLA (te->widgets.editor),
 									SCI_TEXTHEIGHT, 0, 0);
 			/* This ensures that we have arround 1 lines visible upon the mark, 
 			    and locat to to top of the explorer view */
 			scintilla_send_message (SCINTILLA (te->widgets.editor), SCI_GOTOLINE, 
-				linenum_text_editor_to_scintilla (lineno)+ explorer_height - 1, 0);
+				(uptr_t) (linenum_text_editor_to_scintilla (lineno)+ explorer_height - 1), 0);
 			scintilla_send_message (SCINTILLA (te->widgets.editor), SCI_GOTOLINE, 
 				linenum_text_editor_to_scintilla (lineno), 0);
 			/* Since we cannot save this window we make it read-only */
@@ -2058,7 +2058,7 @@
 	if (pid < 1)
 		return;
 	app->registered_child_processes =
-		g_list_append (app->registered_child_processes, (int *) pid);
+		g_list_append (app->registered_child_processes, GINT_TO_POINTER (pid));
 	app->registered_child_processes_cb =
 		g_list_append (app->registered_child_processes_cb,
 			       ch_terminated);
@@ -2072,9 +2072,9 @@
 	gint idx;
 	GList *ptr;
 	
-	idx = g_list_index (app->registered_child_processes, (int *) pid);
+	idx = g_list_index (app->registered_child_processes, GINT_TO_POINTER (pid));
 	app->registered_child_processes =
-		g_list_remove (app->registered_child_processes, (int *) pid);
+		g_list_remove (app->registered_child_processes, GINT_TO_POINTER (pid));
 	
 	ptr = g_list_nth (app->registered_child_processes_cb, idx);
 	// g_assert (ptr != NULL);
@@ -2106,7 +2106,7 @@
 	
 	if (pid < 1)
 		return;
-	idx = g_list_index (app->registered_child_processes, (int *) pid);
+	idx = g_list_index (app->registered_child_processes, GINT_TO_POINTER (pid));
 	if (idx < 0)
 		return;
 	callback =