diff --git a/api/sourcefiles.mak b/api/sourcefiles.mak
index e4d9ae53..16a682a5 100644
--- a/api/sourcefiles.mak
+++ b/api/sourcefiles.mak
@@ -38,7 +38,6 @@ source_files = \
     ../moo/mooedit/mooedithistoryitem.c\
     ../moo/mooedit/mooedithistoryitem.h\
     ../moo/mooedit/mooedit-impl.h\
-    ../moo/mooedit/mooedit-misc.c\
     ../moo/mooedit/mooeditor.c\
     ../moo/mooedit/mooeditor.h\
     ../moo/mooedit/mooeditor-impl.h\
diff --git a/moo/mooapp/mooapp.c b/moo/mooapp/mooapp.c
index 5418af86..99b57b62 100644
--- a/moo/mooapp/mooapp.c
+++ b/moo/mooapp/mooapp.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#define MOO_APP_COMPILATION
 #define WANT_MOO_APP_CMD_CHARS
 #include "mooapp-private.h"
 #include "eggsmclient/eggsmclient.h"
diff --git a/moo/mooedit/mooedit-fileops.c b/moo/mooedit/mooedit-fileops.c
index d58358f0..2aed7f33 100644
--- a/moo/mooedit/mooedit-fileops.c
+++ b/moo/mooedit/mooedit-fileops.c
@@ -17,7 +17,6 @@
 #include "config.h"
 #endif
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooedit-private.h"
 #include "mooedit/mooeditor-impl.h"
 #include "mooedit/mooedit-fileops.h"
@@ -1200,7 +1199,7 @@ try_convert_to_utf8_from_utf8 (const char *data,
 {
     const char *invalid;
     gboolean valid_utf8;
-    
+
 //     g_print ("try_convert_to_utf8_from_utf8()\n");
 
     if (len >= BOM_UTF8_LEN && memcmp (data, BOM_UTF8, BOM_UTF8_LEN) == 0)
@@ -1414,11 +1413,11 @@ moo_convert_file_data_to_utf8 (const char  *data,
     char *freeme = NULL;
     char *result = NULL;
     const char *bom_enc = NULL;
-    
+
 //     g_print ("moo_convert_file_data_to_utf8(%s, %s)\n",
 //              encoding ? encoding : "<null>",
 //              cached_encoding ? cached_encoding : "<null>");
-    
+
     *used_enc = NULL;
 
     if (!encoding && data_has_bom (data, len, &bom_enc))
@@ -1466,7 +1465,7 @@ moo_convert_file_data_to_utf8 (const char  *data,
     return result;
 }
 
-static gboolean 
+static gboolean
 encoding_is_utf8 (const char *encoding)
 {
     return !g_ascii_strcasecmp (encoding, "UTF-8") ||
diff --git a/moo/mooedit/mooedit-fileops.h b/moo/mooedit/mooedit-fileops.h
index 7ced35be..d9e79f5c 100644
--- a/moo/mooedit/mooedit-fileops.h
+++ b/moo/mooedit/mooedit-fileops.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_EDIT_FILE_OPS_H
 #define MOO_EDIT_FILE_OPS_H
 
diff --git a/moo/mooedit/mooedit-misc.c b/moo/mooedit/mooedit-misc.c
deleted file mode 100644
index acf82145..00000000
--- a/moo/mooedit/mooedit-misc.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MOOEDIT_COMPILATION
-#include "mooedit-priv.h"
-
diff --git a/moo/mooedit/mooedit.c b/moo/mooedit/mooedit.c
index ac7e5417..c07b48f5 100644
--- a/moo/mooedit/mooedit.c
+++ b/moo/mooedit/mooedit.c
@@ -34,7 +34,6 @@
  * @MOO_EDIT_STATUS_CLEAN: doesn't prompt on close, even if it's modified.
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditaction-factory.h"
 #include "mooedit/mooedit-private.h"
 #include "mooedit/mooeditview-impl.h"
diff --git a/moo/mooedit/mooeditaction-factory.c b/moo/mooedit/mooeditaction-factory.c
index 801a998f..9d55d350 100644
--- a/moo/mooedit/mooeditaction-factory.c
+++ b/moo/mooedit/mooeditaction-factory.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditaction-factory.h"
 #include "mooedit/mooeditaction.h"
 #include "mooedit/mooedit-private.h"
diff --git a/moo/mooedit/mooeditaction.c b/moo/mooedit/mooeditaction.c
index 08da00b9..e27709c2 100644
--- a/moo/mooedit/mooeditaction.c
+++ b/moo/mooedit/mooeditaction.c
@@ -17,7 +17,6 @@
  * class:MooEditAction: (parent MooAction) (moo.private 1)
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditaction.h"
 #include "mooedit/mooeditaction-factory.h"
 #include "mooedit/mooeditfiltersettings.h"
diff --git a/moo/mooedit/mooeditbookmark.c b/moo/mooedit/mooeditbookmark.c
index c417bd0f..6c586e24 100644
--- a/moo/mooedit/mooeditbookmark.c
+++ b/moo/mooedit/mooeditbookmark.c
@@ -17,7 +17,6 @@
  * class:MooEditBookmark: (parent MooLineMark) (moo.private 1)
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditbookmark.h"
 #include "mooedit/mooedit-private.h"
 #include "mooedit/mootextbuffer.h"
diff --git a/moo/mooedit/mooeditconfig.c b/moo/mooedit/mooeditconfig.c
index b9b48b73..31ae0f4c 100644
--- a/moo/mooedit/mooeditconfig.c
+++ b/moo/mooedit/mooeditconfig.c
@@ -13,8 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
-
 #include "mooedit/mooeditconfig.h"
 #include "mooedit/moolang.h"
 #include "mooedit/mooeditprefs.h"
diff --git a/moo/mooedit/mooeditdialogs.c b/moo/mooedit/mooeditdialogs.c
index b1ad9e15..fad9d41e 100644
--- a/moo/mooedit/mooeditdialogs.c
+++ b/moo/mooedit/mooeditdialogs.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditdialogs.h"
 #include "mooedit/mooeditprefs.h"
 #include "mooedit/mooedit-fileops.h"
diff --git a/moo/mooedit/mooeditfiltersettings.c b/moo/mooedit/mooeditfiltersettings.c
index a17ea9b2..1c70d6a6 100644
--- a/moo/mooedit/mooeditfiltersettings.c
+++ b/moo/mooedit/mooeditfiltersettings.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditfiltersettings.h"
 #include "mooedit/mooeditprefs.h"
 #include "mooedit/mooeditaction.h"
diff --git a/moo/mooedit/mooeditfiltersettings.h b/moo/mooedit/mooeditfiltersettings.h
index 182b150a..18cb26fb 100644
--- a/moo/mooedit/mooeditfiltersettings.h
+++ b/moo/mooedit/mooeditfiltersettings.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be used"
-#endif
-
 #ifndef MOO_EDIT_FILTER_SETTINGS_H
 #define MOO_EDIT_FILTER_SETTINGS_H
 
diff --git a/moo/mooedit/mooeditor-impl.h b/moo/mooedit/mooeditor-impl.h
index 531bba4e..8f62b752 100644
--- a/moo/mooedit/mooeditor-impl.h
+++ b/moo/mooedit/mooeditor-impl.h
@@ -1,10 +1,6 @@
 #ifndef MOO_EDITOR_IMPL_H
 #define MOO_EDITOR_IMPL_H
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be used directly"
-#endif
-
 #include "mooedit/mooeditor.h"
 #include "mooutils/moohistorymgr.h"
 #include "mooutils/moofilewatch.h"
diff --git a/moo/mooedit/mooeditor-tests.c b/moo/mooedit/mooeditor-tests.c
index 485b03f2..87518509 100644
--- a/moo/mooedit/mooeditor-tests.c
+++ b/moo/mooedit/mooeditor-tests.c
@@ -1,4 +1,3 @@
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditor-tests.h"
 #include "mooedit/mooeditor-impl.h"
 #include "mooutils/mooutils-fs.h"
diff --git a/moo/mooedit/mooeditor.c b/moo/mooedit/mooeditor.c
index 37adefd3..acaa7499 100644
--- a/moo/mooedit/mooeditor.c
+++ b/moo/mooedit/mooeditor.c
@@ -17,7 +17,6 @@
  * class:MooEditor: (parent GObject): editor object
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditor-private.h"
 #include "mooedit/mooeditwindow-impl.h"
 #include "mooedit/mooeditdialogs.h"
diff --git a/moo/mooedit/mooeditprefs.c b/moo/mooedit/mooeditprefs.c
index d40075c5..54e65543 100644
--- a/moo/mooedit/mooeditprefs.c
+++ b/moo/mooedit/mooeditprefs.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditprefs.h"
 #include "mooedit/mooedit-impl.h"
 #include "mooedit/mooeditview-impl.h"
diff --git a/moo/mooedit/mooeditprefspage.c b/moo/mooedit/mooeditprefspage.c
index 664441f6..c8f74c18 100644
--- a/moo/mooedit/mooeditprefspage.c
+++ b/moo/mooedit/mooeditprefspage.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooedit-impl.h"
 #include "mooedit/mooeditor-impl.h"
 #include "mooedit/mooeditprefs.h"
diff --git a/moo/mooedit/mooeditview.c b/moo/mooedit/mooeditview.c
index 79ab11ed..28c11bf6 100644
--- a/moo/mooedit/mooeditview.c
+++ b/moo/mooedit/mooeditview.c
@@ -2,7 +2,6 @@
  * class:MooEditView: (parent MooTextView) (moo.doc-object-name view): document view object
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooeditview-priv.h"
 #include "mooedit/mooedit-impl.h"
 #include "mooedit/mooeditwindow-impl.h"
diff --git a/moo/mooedit/mooeditwindow.c b/moo/mooedit/mooeditwindow.c
index 68d4bef8..c9ff38eb 100644
--- a/moo/mooedit/mooeditwindow.c
+++ b/moo/mooedit/mooeditwindow.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooedit-impl.h"
 #include "mooedit/mooeditdialogs.h"
 #include "mooedit/mooeditwindow-impl.h"
diff --git a/moo/mooedit/moofold.c b/moo/mooedit/moofold.c
index 2b3269c7..79bdfa8b 100644
--- a/moo/mooedit/moofold.c
+++ b/moo/mooedit/moofold.c
@@ -14,7 +14,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootext-private.h"
 #include "marshals.h"
 
diff --git a/moo/mooedit/moofold.h b/moo/mooedit/moofold.h
index 9dfeb3b0..4a1f8d76 100644
--- a/moo/mooedit/moofold.h
+++ b/moo/mooedit/moofold.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FOLD_H
 #define MOO_FOLD_H
 
diff --git a/moo/mooedit/moolang-private.h b/moo/mooedit/moolang-private.h
index 8a45fa42..76da2cfb 100644
--- a/moo/mooedit/moolang-private.h
+++ b/moo/mooedit/moolang-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be used"
-#endif
-
 #ifndef MOO_LANG_PRIVATE_H
 #define MOO_LANG_PRIVATE_H
 
diff --git a/moo/mooedit/moolang.c b/moo/mooedit/moolang.c
index 36ebe3d4..c4ff3ec0 100644
--- a/moo/mooedit/moolang.c
+++ b/moo/mooedit/moolang.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/moo/mooedit/moolangmgr-private.h b/moo/mooedit/moolangmgr-private.h
index f7ab30cc..02f98797 100644
--- a/moo/mooedit/moolangmgr-private.h
+++ b/moo/mooedit/moolangmgr-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be used"
-#endif
-
 #ifndef MOO_LANG_MGR_PRIVATE_H
 #define MOO_LANG_MGR_PRIVATE_H
 
diff --git a/moo/mooedit/moolangmgr.c b/moo/mooedit/moolangmgr.c
index 1b0654ab..94de273b 100644
--- a/moo/mooedit/moolangmgr.c
+++ b/moo/mooedit/moolangmgr.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/moo/mooedit/moolinebuffer.c b/moo/mooedit/moolinebuffer.c
index e6a7d072..661aa25e 100644
--- a/moo/mooedit/moolinebuffer.c
+++ b/moo/mooedit/moolinebuffer.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootext-private.h"
 #include "mooutils/mooutils-mem.h"
 
diff --git a/moo/mooedit/moolinebuffer.h b/moo/mooedit/moolinebuffer.h
index acbc67ef..c98a7851 100644
--- a/moo/mooedit/moolinebuffer.h
+++ b/moo/mooedit/moolinebuffer.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_LINE_BUFFER_H
 #define MOO_LINE_BUFFER_H
 
diff --git a/moo/mooedit/moolinemark.c b/moo/mooedit/moolinemark.c
index 55ce9adb..06437d32 100644
--- a/moo/mooedit/moolinemark.c
+++ b/moo/mooedit/moolinemark.c
@@ -18,7 +18,6 @@
  * class:MooLineMark: (parent GObject) (constructable) (moo.private 1)
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootext-private.h"
 #include "mooedit/mootextbuffer.h"
 #include "marshals.h"
diff --git a/moo/mooedit/mootext-private.h b/moo/mooedit/mootext-private.h
index 06bba853..ee8699df 100644
--- a/moo/mooedit/mootext-private.h
+++ b/moo/mooedit/mootext-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_TEXT_PRIVATE_H
 #define MOO_TEXT_PRIVATE_H
 
diff --git a/moo/mooedit/mootextbtree.c b/moo/mooedit/mootextbtree.c
index c5c53509..123fbced 100644
--- a/moo/mooedit/mootextbtree.c
+++ b/moo/mooedit/mootextbtree.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootext-private.h"
 #include "mooutils/mooutils-mem.h"
 
diff --git a/moo/mooedit/mootextbtree.h b/moo/mooedit/mootextbtree.h
index 2eabfef7..abc25182 100644
--- a/moo/mooedit/mootextbtree.h
+++ b/moo/mooedit/mootextbtree.h
@@ -16,10 +16,6 @@
 #ifndef MOO_TEXT_BTREE_H
 #define MOO_TEXT_BTREE_H
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be included"
-#endif
-
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/moo/mooedit/mootextbuffer.c b/moo/mooedit/mootextbuffer.c
index 485b7064..bc80f92e 100644
--- a/moo/mooedit/mootextbuffer.c
+++ b/moo/mooedit/mootextbuffer.c
@@ -17,7 +17,6 @@
  * class:MooTextBuffer: (parent GtkTextBuffer) (moo.private 1)
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootextiter.h"
 #include "mooedit/mootext-private.h"
 #include "mooedit/moolang-private.h"
diff --git a/moo/mooedit/mootextprint-private.h b/moo/mooedit/mootextprint-private.h
index aecbeaa2..599f0d21 100644
--- a/moo/mooedit/mootextprint-private.h
+++ b/moo/mooedit/mootextprint-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be used directly"
-#endif
-
 #ifndef MOO_TEXT_PRINT_PRIVATE_H
 #define MOO_TEXT_PRINT_PRIVATE_H
 
diff --git a/moo/mooedit/mootextprint.c b/moo/mooedit/mootextprint.c
index 569ff921..4a478c75 100644
--- a/moo/mooedit/mootextprint.c
+++ b/moo/mooedit/mootextprint.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootextprint-private.h"
 #include "mooedit/mooedit.h"
 #include "mooedit/mooedit-impl.h"
diff --git a/moo/mooedit/mootextprint.h b/moo/mooedit/mootextprint.h
index 7db1941f..df1a40d4 100644
--- a/moo/mooedit/mootextprint.h
+++ b/moo/mooedit/mootextprint.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be used directly"
-#endif
-
 #ifndef MOO_TEXT_PRINT_H
 #define MOO_TEXT_PRINT_H
 
diff --git a/moo/mooedit/mootextstylescheme.c b/moo/mooedit/mootextstylescheme.c
index 584b417c..70c71168 100644
--- a/moo/mooedit/mootextstylescheme.c
+++ b/moo/mooedit/mootextstylescheme.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootextstylescheme.h"
 #include "mooedit/mootextview.h"
 #include "mooutils/mooi18n.h"
diff --git a/moo/mooedit/mootextview-input.c b/moo/mooedit/mootextview-input.c
index 9f410dcc..7b443517 100644
--- a/moo/mooedit/mootextview-input.c
+++ b/moo/mooedit/mootextview-input.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mootextview-private.h"
 #include "mooedit/mooeditview-impl.h"
 #include "mooedit/mootextiter.h"
diff --git a/moo/mooedit/mootextview-private.h b/moo/mooedit/mootextview-private.h
index 23dd810f..272d2146 100644
--- a/moo/mooedit/mootextview-private.h
+++ b/moo/mooedit/mootextview-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "Do not include this file"
-#endif
-
 #ifndef MOO_TEXT_VIEW_PRIVATE_H
 #define MOO_TEXT_VIEW_PRIVATE_H
 
diff --git a/moo/mooedit/mootextview.c b/moo/mooedit/mootextview.c
index 8e5592f9..20edc550 100644
--- a/moo/mooedit/mootextview.c
+++ b/moo/mooedit/mootextview.c
@@ -17,7 +17,6 @@
  * class:MooTextView: (parent GtkTextView) (constructable): text view object
  **/
 
-#define MOOEDIT_COMPILATION
 #include "mooedit/mooedit-accels.h"
 #include "mooedit/mootextview-private.h"
 #include "mooedit/mootextview.h"
diff --git a/moo/moofileview/moobookmarkmgr.c b/moo/moofileview/moobookmarkmgr.c
index 766b3e36..e9389877 100644
--- a/moo/moofileview/moobookmarkmgr.c
+++ b/moo/moofileview/moobookmarkmgr.c
@@ -17,7 +17,6 @@
 #include "config.h"
 #endif
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/moobookmarkmgr.h"
 #include "moofileview/moofileentry.h"
 #include "mooutils/mooprefs.h"
diff --git a/moo/moofileview/moobookmarkview.c b/moo/moofileview/moobookmarkview.c
index e1e46488..99de5f5e 100644
--- a/moo/moofileview/moobookmarkview.c
+++ b/moo/moofileview/moobookmarkview.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/moobookmarkview.h"
 #include "marshals.h"
 #include <gtk/gtk.h>
diff --git a/moo/moofileview/moobookmarkview.h b/moo/moofileview/moobookmarkview.h
index ddd43646..4773fe7c 100644
--- a/moo/moofileview/moobookmarkview.h
+++ b/moo/moofileview/moobookmarkview.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_BOOKMARK_VIEW_H
 #define MOO_BOOKMARK_VIEW_H
 
diff --git a/moo/moofileview/moofile-private.h b/moo/moofileview/moofile-private.h
index 720c2e2d..a5dee6a7 100644
--- a/moo/moofileview/moofile-private.h
+++ b/moo/moofileview/moofile-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FILE_PRIVATE_H
 #define MOO_FILE_PRIVATE_H
 
diff --git a/moo/moofileview/moofile.c b/moo/moofileview/moofile.c
index 2a1c291a..5a695473 100644
--- a/moo/moofileview/moofile.c
+++ b/moo/moofileview/moofile.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/moofilesystem.h"
 #include "moofileview/moofile-private.h"
 #include "mooutils/moofileicon.h"
diff --git a/moo/moofileview/moofileentry.c b/moo/moofileview/moofileentry.c
index b5273910..87c3c4bb 100644
--- a/moo/moofileview/moofileentry.c
+++ b/moo/moofileview/moofileentry.c
@@ -15,7 +15,6 @@
 
 /* XXX use MooCombo */
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileentry.h"
 #include "moofilesystem.h"
 #include "moofoldermodel.h"
diff --git a/moo/moofileview/moofilesystem.c b/moo/moofileview/moofilesystem.c
index 76adcac5..694ae03e 100644
--- a/moo/moofileview/moofilesystem.c
+++ b/moo/moofileview/moofilesystem.c
@@ -15,7 +15,6 @@
 
 #include <config.h>
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofilesystem.h"
 #include "moofolder-private.h"
 #include "mooutils/mooutils-fs.h"
diff --git a/moo/moofileview/moofilesystem.h b/moo/moofileview/moofilesystem.h
index ac6d81c8..5b3fc7c6 100644
--- a/moo/moofileview/moofilesystem.h
+++ b/moo/moofileview/moofilesystem.h
@@ -19,10 +19,6 @@
  *  from gtk/gtkfilesystem.h).
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FILE_SYSTEM_H
 #define MOO_FILE_SYSTEM_H
 
diff --git a/moo/moofileview/moofileview-aux.h b/moo/moofileview/moofileview-aux.h
index 43bec231..7f29f4eb 100644
--- a/moo/moofileview/moofileview-aux.h
+++ b/moo/moofileview/moofileview-aux.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #include "moofileview/moofile-private.h"
 #include <string.h>
 #include <glib.h>
diff --git a/moo/moofileview/moofileview-dialogs.c b/moo/moofileview/moofileview-dialogs.c
index 9b1d48dc..ebd406f5 100644
--- a/moo/moofileview/moofileview-dialogs.c
+++ b/moo/moofileview/moofileview-dialogs.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/moofileview-dialogs.h"
 #include "moofileview/moofilesystem.h"
 #include "moofileview/moofile-private.h"
diff --git a/moo/moofileview/moofileview-dialogs.h b/moo/moofileview/moofileview-dialogs.h
index 17793fce..807300b3 100644
--- a/moo/moofileview/moofileview-dialogs.h
+++ b/moo/moofileview/moofileview-dialogs.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FILE_VIEW_DIALOGS_H
 #define MOO_FILE_VIEW_DIALOGS_H
 
diff --git a/moo/moofileview/moofileview-private.h b/moo/moofileview/moofileview-private.h
index c6c82aca..ee53c642 100644
--- a/moo/moofileview/moofileview-private.h
+++ b/moo/moofileview/moofileview-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #include <moofileview/moofileview-impl.h>
 #include <gtk/gtk.h>
 
diff --git a/moo/moofileview/moofileview-tools.c b/moo/moofileview/moofileview-tools.c
index 4b8b9701..e7455ab3 100644
--- a/moo/moofileview/moofileview-tools.c
+++ b/moo/moofileview/moofileview-tools.c
@@ -17,7 +17,6 @@
 #include "config.h"
 #endif
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/moofileview-tools.h"
 #include "moofileview/moofileview-private.h"
 #include "moofileview/moofile-private.h"
diff --git a/moo/moofileview/moofileview.c b/moo/moofileview/moofileview.c
index e2fd549e..05170e10 100644
--- a/moo/moofileview/moofileview.c
+++ b/moo/moofileview/moofileview.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/moofileview-accels.h"
 #include "moofileview/moofileview-dialogs.h"
 #include "moofileview/moobookmarkmgr.h"
diff --git a/moo/moofileview/moofolder-private.h b/moo/moofileview/moofolder-private.h
index b1310d6f..e5991d38 100644
--- a/moo/moofileview/moofolder-private.h
+++ b/moo/moofileview/moofolder-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FOLDER_PRIVATE_H
 #define MOO_FOLDER_PRIVATE_H
 
diff --git a/moo/moofileview/moofolder.c b/moo/moofileview/moofolder.c
index b59c24c6..7cfa5ab2 100644
--- a/moo/moofileview/moofolder.c
+++ b/moo/moofileview/moofolder.c
@@ -17,7 +17,6 @@
 #include "config.h"
 #endif
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/moofilesystem.h"
 #include "moofileview/moofolder-private.h"
 #include "mooutils/mooutils-fs.h"
diff --git a/moo/moofileview/moofolder.h b/moo/moofileview/moofolder.h
index 76e2c66b..b1c5cd2c 100644
--- a/moo/moofileview/moofolder.h
+++ b/moo/moofileview/moofolder.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FOLDER_H
 #define MOO_FOLDER_H
 
diff --git a/moo/moofileview/moofoldermodel-private.h b/moo/moofileview/moofoldermodel-private.h
index 8435bc89..0369fe42 100644
--- a/moo/moofileview/moofoldermodel-private.h
+++ b/moo/moofileview/moofoldermodel-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FOLDER_MODEL_PRIVATE_H
 #define MOO_FOLDER_MODEL_PRIVATE_H
 
diff --git a/moo/moofileview/moofoldermodel.c b/moo/moofileview/moofoldermodel.c
index d8c99513..47e18ddd 100644
--- a/moo/moofileview/moofoldermodel.c
+++ b/moo/moofileview/moofoldermodel.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofoldermodel.h"
 #include "moofile-private.h"
 #include "moofolder-private.h"
diff --git a/moo/moofileview/moofoldermodel.h b/moo/moofileview/moofoldermodel.h
index d33edaa6..8f3609f6 100644
--- a/moo/moofileview/moofoldermodel.h
+++ b/moo/moofileview/moofoldermodel.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_FOLDER_MODEL_H
 #define MOO_FOLDER_MODEL_H
 
diff --git a/moo/moofileview/mooiconview.c b/moo/moofileview/mooiconview.c
index f16f3be2..9ea2593e 100644
--- a/moo/moofileview/mooiconview.c
+++ b/moo/moofileview/mooiconview.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "mooiconview.h"
 #include "marshals.h"
 #include "mooutils/mooaccel.h"
diff --git a/moo/moofileview/mooiconview.h b/moo/moofileview/mooiconview.h
index b89789cf..0fe652bf 100644
--- a/moo/moofileview/mooiconview.h
+++ b/moo/moofileview/mooiconview.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_ICON_VIEW_H
 #define MOO_ICON_VIEW_H
 
diff --git a/moo/moofileview/mootreeview.c b/moo/moofileview/mootreeview.c
index cf9cedcb..0a1d298f 100644
--- a/moo/moofileview/mootreeview.c
+++ b/moo/moofileview/mootreeview.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOO_FILE_VIEW_COMPILATION
 #include "moofileview/mootreeview.h"
 #include "marshals.h"
 #include "mooutils/mooutils-gobject.h"
diff --git a/moo/moofileview/mootreeview.h b/moo/moofileview/mootreeview.h
index 76aa0c16..986ec31b 100644
--- a/moo/moofileview/mootreeview.h
+++ b/moo/moofileview/mootreeview.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOO_FILE_VIEW_COMPILATION
-#error "This file may not be included"
-#endif
-
 #ifndef MOO_TREE_VIEW_H
 #define MOO_TREE_VIEW_H
 
diff --git a/moo/plugins/usertools/moocommand-private.h b/moo/plugins/usertools/moocommand-private.h
index 8ce2f380..a815b877 100644
--- a/moo/plugins/usertools/moocommand-private.h
+++ b/moo/plugins/usertools/moocommand-private.h
@@ -13,10 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOOEDIT_COMPILATION
-#error "This file may not be used"
-#endif
-
 #ifndef MOO_COMMAND_PRIVATE_H
 #define MOO_COMMAND_PRIVATE_H
 
diff --git a/moo/plugins/usertools/moocommand.c b/moo/plugins/usertools/moocommand.c
index 66c8b358..9d437d67 100644
--- a/moo/plugins/usertools/moocommand.c
+++ b/moo/plugins/usertools/moocommand.c
@@ -17,7 +17,6 @@
 #include <config.h>
 #endif
 
-#define MOOEDIT_COMPILATION
 #include "moocommand-private.h"
 #include "moocommand-script.h"
 #include "moocommand-exe.h"
diff --git a/moo/plugins/usertools/moocommanddisplay.c b/moo/plugins/usertools/moocommanddisplay.c
index 48b092dc..b6f4046d 100644
--- a/moo/plugins/usertools/moocommanddisplay.c
+++ b/moo/plugins/usertools/moocommanddisplay.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "moocommanddisplay.h"
 #include "moocommand-private.h"
 #include "mooutils/mooutils-misc.h"
diff --git a/moo/plugins/usertools/moooutputfilterregex.c b/moo/plugins/usertools/moooutputfilterregex.c
index 36b8e26e..0eb59c16 100644
--- a/moo/plugins/usertools/moooutputfilterregex.c
+++ b/moo/plugins/usertools/moooutputfilterregex.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "moooutputfilterregex.h"
 #include "moocommand.h"
 #include "moocmdview.h"
diff --git a/moo/plugins/usertools/moousertools.c b/moo/plugins/usertools/moousertools.c
index 04cb6972..b7aa1cc3 100644
--- a/moo/plugins/usertools/moousertools.c
+++ b/moo/plugins/usertools/moousertools.c
@@ -13,7 +13,6 @@
  *   License along with medit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MOOEDIT_COMPILATION
 #include "moousertools.h"
 #include "moousertools-prefs.h"
 #include "moocommand-private.h"