diff --git a/ChangeLog b/ChangeLog
index c4fc50e..e1a1a9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2012-04-07
 
   version UNRELEASED:
+	* Better compatibility with some compilers and CFLAGS
+	  Thanks to Daniel Richard G. <skunk AT iSKUNK DOT ORG>
 	* Revert workaround for line number color, fixed by GTK+ upstream.
 
 2012-02-20
diff --git a/src/gtkprint.c b/src/gtkprint.c
index 704a5f2..f01d08a 100644
--- a/src/gtkprint.c
+++ b/src/gtkprint.c
@@ -18,6 +18,7 @@
  */
 
 #include <gtk/gtk.h>
+#include "gtkprint.h"
 
 static PangoLayout *layout;
 static const PangoFontDescription *font_desc;
diff --git a/src/indent.c b/src/indent.c
index b824531..13e8a63 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -21,6 +21,7 @@
 #include <gtk/gtk.h>
 //#include <gdk/gdkkeysyms.h>
 #include <undo.h>
+#include "indent.h"
 
 static gboolean auto_indent = FALSE;
 static gint default_tab_width = 8;
diff --git a/src/l3afpad.h b/src/l3afpad.h
index 9cac5e9..89c6035 100644
--- a/src/l3afpad.h
+++ b/src/l3afpad.h
@@ -28,6 +28,10 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
+#ifndef ENABLE_EMACS
+#define ENABLE_EMACS 0
+#endif
+
 #ifndef ENABLE_PRINT
 #define ENABLE_PRINT 1
 #endif
@@ -114,7 +118,9 @@ typedef struct {
 	MainWin *mw;
 } PublicData;
 
-PublicData *pub;
+#ifndef _L3AFPAD_MAIN
+extern PublicData *pub;
+#endif
 
 void save_config_file(void);
 
diff --git a/src/linenum.c b/src/linenum.c
index cbb0887..033c660 100644
--- a/src/linenum.c
+++ b/src/linenum.c
@@ -18,6 +18,7 @@
  */
 
 #include <gtk/gtk.h>
+#include "linenum.h"
 
 #define	DV(x)
 
diff --git a/src/main.c b/src/main.c
index f3faa14..763a92f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,12 +17,15 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _L3AFPAD_MAIN
 #include "l3afpad.h"
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+PublicData *pub;
+
 typedef struct {
 	gint width;
 	gint height;
diff --git a/src/undo.h b/src/undo.h
index e2d4bd0..d2406c5 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -20,6 +20,8 @@
 #ifndef _UNDO_H
 #define _UNDO_H
 
+gboolean undo_redo_real(GtkTextBuffer *buffer);
+gboolean undo_undo_real(GtkTextBuffer *buffer);
 void undo_reset_modified_step(GtkTextBuffer *buffer);
 void undo_clear_all(GtkTextBuffer *buffer);
 void undo_init(GtkWidget *view, GtkWidget *undo_button, GtkWidget *redo_button);