4 files changed, 8 insertions, 15 deletions
diff --git a/plugins/winordinals/Makefile.am b/plugins/winordinals/Makefile.am
index f9ff14f..592d38a 100644
--- a/plugins/winordinals/Makefile.am
+++ b/plugins/winordinals/Makefile.am
@@ -50,6 +50,8 @@ libwinordinals_la_SOURCES =					\
 libwinordinals_la_LIBADD =					\
 	$(PYTHON3_LIBADD)
 
+libwinordinals_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 libwinordinals_la_LDFLAGS =					\
 	-avoid-version							\
 	-L$(top_srcdir)/src/.libs -lchrysacore	\
@@ -62,8 +64,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libwinordinals_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = $(PYTHON3_SUBDIRS)
diff --git a/plugins/winordinals/assign.h b/plugins/winordinals/assign.h
index 20310d2..e88ee28 100644
--- a/plugins/winordinals/assign.h
+++ b/plugins/winordinals/assign.h
@@ -25,7 +25,7 @@
 #define _PLUGINS_WINORDINALS_ASSIGN_H
 
 
-#include <gtkext/gtkstatusstack.h>
+#include <glibext/notifier.h>
 #include <plugins/pe/format.h>
 
 
diff --git a/plugins/winordinals/core.c b/plugins/winordinals/core.c
index a16c400..bae2d6d 100644
--- a/plugins/winordinals/core.c
+++ b/plugins/winordinals/core.c
@@ -31,12 +31,12 @@
 
 
 #include "assign.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -67,7 +67,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = true;
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 
     if (result)
         result = add_winordinals_module_to_python_module();
diff --git a/plugins/winordinals/python/Makefile.am b/plugins/winordinals/python/Makefile.am
index a5f17a4..201650d 100644
--- a/plugins/winordinals/python/Makefile.am
+++ b/plugins/winordinals/python/Makefile.am
@@ -4,15 +4,10 @@ noinst_LTLIBRARIES = libwinordinalspython.la
 libwinordinalspython_la_SOURCES =			\
 	module.h module.c
 
-libwinordinalspython_la_LDFLAGS = 
+libwinordinalspython_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libwinordinalspython_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)