GNOME.org
 

[gjs] Use GNOME_COMPILE_WARNINGS([maximum])

commit e4d12cd64050da041dd283c09a6b2556797ec372
Author: Colin Walters <walters verbum org>
Date:   Tue Nov 13 17:39:53 2012 -0500

    Use GNOME_COMPILE_WARNINGS([maximum])
    
    In order to avoid getting spammed by warnings from including jsapi.h
    which we don't control, centralize its inclusion in one place,
    wrapping it with GCC pragmas to disable selected warnings.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=688289

 Makefile.am              |    1 +
 configure.ac             |   27 ++-------------------------
 gi/arg.h                 |    2 +-
 gi/boxed.c               |    2 --
 gi/boxed.h               |    2 +-
 gi/closure.h             |    2 +-
 gi/enumeration.c         |    2 --
 gi/enumeration.h         |    2 +-
 gi/function.c            |    2 --
 gi/function.h            |    2 +-
 gi/gerror.c              |    3 ---
 gi/gerror.h              |    5 ++---
 gi/gtype.c               |    2 --
 gi/gtype.h               |    4 +---
 gi/interface.c           |    1 -
 gi/interface.h           |    4 +---
 gi/keep-alive.c          |    2 --
 gi/keep-alive.h          |    2 +-
 gi/ns.c                  |    3 ---
 gi/ns.h                  |    4 +---
 gi/object.c              |    3 ---
 gi/object.h              |    4 +---
 gi/param.c               |    2 --
 gi/param.h               |    4 +---
 gi/union.c               |    3 ---
 gi/union.h               |    4 +---
 gi/value.h               |    3 +--
 gjs/byteArray.c          |    1 -
 gjs/byteArray.h          |    3 +--
 gjs/compat.h             |    5 +++++
 gjs/context.c            |    2 --
 gjs/gi.h                 |    4 +---
 gjs/importer.h           |    3 +--
 gjs/jsapi-private.cpp    |    4 ++++
 gjs/jsapi-private.h      |    2 +-
 gjs/jsapi-util.h         |    1 -
 gjs/mem.h                |    2 +-
 gjs/native.h             |    3 +--
 gjs/profiler.c           |    1 -
 gjs/profiler.h           |    2 +-
 gjs/stack.c              |    1 -
 modules/console.c        |    1 -
 modules/console.h        |    3 +--
 modules/dbus-exports.c   |    2 --
 modules/dbus-exports.h   |    2 +-
 modules/dbus.h           |    4 +---
 modules/debugger.c       |    2 --
 modules/debugger.h       |    3 +--
 modules/format.c         |    1 -
 modules/format.h         |    3 +--
 modules/gettext-native.c |    1 -
 modules/gettext-native.h |    3 +--
 modules/lang.c           |    1 -
 modules/lang.h           |    3 +--
 modules/mainloop.c       |    2 --
 modules/mainloop.h       |    3 +--
 modules/system.c         |    2 --
 modules/system.h         |    3 +--
 58 files changed, 43 insertions(+), 127 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 406443f..4668804 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@ TEST_PROGS =
 check_PROGRAMS = $(TEST_PROGS)
 INTROSPECTION_GIRS =
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+AM_CFLAGS = $(WARN_CFLAGS)
 
 gjsjsdir = @gjsjsdir@
 gjsoverridedir = $(gjsjsdir)/overrides
diff --git a/configure.ac b/configure.ac
index abe632c..af3c5e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,31 +37,8 @@ dnl DOLT
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
-# Add extra warning flags
-changequote(,)dnl
-ensureflag() {
-  flag="$1"; shift
-  result="$@"
-
-  case " ${result} " in
-  *[\ \	]${flag}[\ \	]*) ;;
-  *) result="${flag} ${result}" ;;
-  esac
-
-  echo ${result}
-}
-changequote([,])dnl
-
-if test "$GCC" = "yes"; then
-    for flag in -Wall -Wchar-subscripts -Wmissing-declarations \
-        -Wpointer-arith -Wcast-align -Wsign-compare;
-    do
-        CFLAGS="`ensureflag $flag $CFLAGS`"
-        CXXFLAGS="`ensureflag $flag $CXXFLAGS`"
-    done
-    CFLAGS="`ensureflag -Wmissing-prototypes $CFLAGS`"
-    CFLAGS="`ensureflag -Wnested-externs $CFLAGS`"
-fi
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
 
 # coverage
 AC_ARG_ENABLE([coverage],
diff --git a/gi/arg.h b/gi/arg.h
index f89a748..66621ad 100644
--- a/gi/arg.h
+++ b/gi/arg.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 #include <girepository.h>
 
diff --git a/gi/boxed.c b/gi/boxed.c
index 44b4723..381a44f 100644
--- a/gi/boxed.c
+++ b/gi/boxed.c
@@ -36,8 +36,6 @@
 
 #include <util/log.h>
 
-#include <jsapi.h>
-
 #include <girepository.h>
 
 typedef struct {
diff --git a/gi/boxed.h b/gi/boxed.h
index 6f32456..740137e 100644
--- a/gi/boxed.h
+++ b/gi/boxed.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 #include <girepository.h>
 
diff --git a/gi/closure.h b/gi/closure.h
index f894805..8158455 100644
--- a/gi/closure.h
+++ b/gi/closure.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/enumeration.c b/gi/enumeration.c
index d4d96a3..2fa7dfa 100644
--- a/gi/enumeration.c
+++ b/gi/enumeration.c
@@ -32,8 +32,6 @@
 
 #include <util/log.h>
 
-#include <jsapi.h>
-
 #include <girepository.h>
 
 #include "enumeration.h"
diff --git a/gi/enumeration.h b/gi/enumeration.h
index 3642def..2048887 100644
--- a/gi/enumeration.h
+++ b/gi/enumeration.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 #include <girepository.h>
 
diff --git a/gi/function.c b/gi/function.c
index 70e50e2..19dd427 100644
--- a/gi/function.c
+++ b/gi/function.c
@@ -34,8 +34,6 @@
 
 #include <util/log.h>
 
-#include <jsapi.h>
-
 #include <girepository.h>
 #include <sys/mman.h>
 #include <unistd.h>
diff --git a/gi/function.h b/gi/function.h
index b77b5c5..26df9bb 100644
--- a/gi/function.h
+++ b/gi/function.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 #include <girepository.h>
 #include <girffi.h>
diff --git a/gi/gerror.c b/gi/gerror.c
index 5c035a1..36b2da8 100644
--- a/gi/gerror.c
+++ b/gi/gerror.c
@@ -34,9 +34,6 @@
 
 #include <util/log.h>
 
-#include <jsapi.h>
-#include <jsdbgapi.h>
-
 #include <girepository.h>
 
 typedef struct {
diff --git a/gi/gerror.h b/gi/gerror.h
index eddee61..61d67b0 100644
--- a/gi/gerror.h
+++ b/gi/gerror.h
@@ -25,11 +25,10 @@
 #define __GJS_ERROR_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
 
+#include "gjs/jsapi-util.h"
+
 G_BEGIN_DECLS
 
 JSBool    gjs_define_error_class       (JSContext             *context,
diff --git a/gi/gtype.c b/gi/gtype.c
index a297f9d..c6e10ce 100644
--- a/gi/gtype.c
+++ b/gi/gtype.c
@@ -29,8 +29,6 @@
 #include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <util/log.h>
-
-#include <jsapi.h>
 #include <girepository.h>
 
 GJS_DEFINE_PROTO_ABSTRACT("GIRepositoryGType", gtype);
diff --git a/gi/gtype.h b/gi/gtype.h
index 645d6f5..0214785 100644
--- a/gi/gtype.h
+++ b/gi/gtype.h
@@ -26,10 +26,8 @@
 #define __GJS_GTYPE_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/interface.c b/gi/interface.c
index c8147b2..1b50077 100644
--- a/gi/interface.c
+++ b/gi/interface.c
@@ -32,7 +32,6 @@
 #include <gjs/compat.h>
 #include <util/log.h>
 
-#include <jsapi.h>
 #include <girepository.h>
 
 typedef struct {
diff --git a/gi/interface.h b/gi/interface.h
index db49647..f8c3c4d 100644
--- a/gi/interface.h
+++ b/gi/interface.h
@@ -26,10 +26,8 @@
 #define __GJS_INTERFACE_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/keep-alive.c b/gi/keep-alive.c
index d45740a..4ab4b8d 100644
--- a/gi/keep-alive.c
+++ b/gi/keep-alive.c
@@ -31,8 +31,6 @@
 #include <util/log.h>
 #include <util/glib.h>
 
-#include <jsapi.h>
-
 typedef struct {
     GjsUnrootedFunc notify;
     JSObject *child;
diff --git a/gi/keep-alive.h b/gi/keep-alive.h
index c3683c4..fb197ff 100644
--- a/gi/keep-alive.h
+++ b/gi/keep-alive.h
@@ -25,7 +25,7 @@
 #define __GJS_KEEP_ALIVE_H__
 
 #include <glib.h>
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/ns.c b/gi/ns.c
index f5d9c2b..a2fe9bf 100644
--- a/gi/ns.c
+++ b/gi/ns.c
@@ -30,9 +30,6 @@
 #include <gjs/compat.h>
 
 #include <util/log.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
 
 #include <string.h>
diff --git a/gi/ns.h b/gi/ns.h
index f717ea6..4f8b45e 100644
--- a/gi/ns.h
+++ b/gi/ns.h
@@ -25,10 +25,8 @@
 #define __GJS_NS_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/object.c b/gi/object.c
index fb77924..7e83a15 100644
--- a/gi/object.c
+++ b/gi/object.c
@@ -42,9 +42,6 @@
 #include <gjs/type-module.h>
 
 #include <util/log.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
 
 typedef struct {
diff --git a/gi/object.h b/gi/object.h
index 1957abd..a494946 100644
--- a/gi/object.h
+++ b/gi/object.h
@@ -25,10 +25,8 @@
 #define __GJS_OBJECT_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/param.c b/gi/param.c
index 509bdf7..44e280c 100644
--- a/gi/param.c
+++ b/gi/param.c
@@ -35,8 +35,6 @@
 
 #include <util/log.h>
 
-#include <jsapi.h>
-
 typedef struct {
     GParamSpec *gparam; /* NULL if we are the prototype and not an instance */
 } Param;
diff --git a/gi/param.h b/gi/param.h
index 56d2fed..15b004d 100644
--- a/gi/param.h
+++ b/gi/param.h
@@ -25,10 +25,8 @@
 #define __GJS_PARAM_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/union.c b/gi/union.c
index 53ff468..c42db62 100644
--- a/gi/union.c
+++ b/gi/union.c
@@ -36,9 +36,6 @@
 #include "repo.h"
 #include "function.h"
 #include "gtype.h"
-
-#include <jsapi.h>
-
 #include <girepository.h>
 
 typedef struct {
diff --git a/gi/union.h b/gi/union.h
index 08aff51..81eb66d 100644
--- a/gi/union.h
+++ b/gi/union.h
@@ -25,10 +25,8 @@
 #define __GJS_UNION_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gi/value.h b/gi/value.h
index 8340fcf..00bbb3e 100644
--- a/gi/value.h
+++ b/gi/value.h
@@ -25,8 +25,7 @@
 #define __GJS_VALUE_H__
 
 #include <glib-object.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/byteArray.c b/gjs/byteArray.c
index 729c06f..13c4fcf 100644
--- a/gjs/byteArray.c
+++ b/gjs/byteArray.c
@@ -28,7 +28,6 @@
 #include <gjs/gjs-module.h>
 #include <gjs/compat.h>
 #include <util/log.h>
-#include <jsapi.h>
 
 typedef struct {
     GByteArray *array;
diff --git a/gjs/byteArray.h b/gjs/byteArray.h
index e0a8ae4..12c05eb 100644
--- a/gjs/byteArray.h
+++ b/gjs/byteArray.h
@@ -29,8 +29,7 @@
 #endif
 
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/compat.h b/gjs/compat.h
index 8582e74..3053389 100644
--- a/gjs/compat.h
+++ b/gjs/compat.h
@@ -29,7 +29,12 @@
 #ifndef __GJS_COMPAT_H__
 #define __GJS_COMPAT_H__
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
 #include <jsapi.h>
+#include <jsdbgapi.h> // Needed by some bits
+#pragma GCC diagnostic pop
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/gjs/context.c b/gjs/context.c
index 06b8af2..b7f799a 100644
--- a/gjs/context.c
+++ b/gjs/context.c
@@ -39,8 +39,6 @@
 
 #include <string.h>
 
-#include <jsapi.h>
-
 #define _GJS_JS_VERSION_DEFAULT "1.8"
 
 static void     gjs_context_dispose           (GObject               *object);
diff --git a/gjs/gi.h b/gjs/gi.h
index b3705e2..c8da00f 100644
--- a/gjs/gi.h
+++ b/gjs/gi.h
@@ -25,10 +25,8 @@
 #define __GJS_GI_H__
 
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <girepository.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/importer.h b/gjs/importer.h
index fea7982..fe60dd9 100644
--- a/gjs/importer.h
+++ b/gjs/importer.h
@@ -29,8 +29,7 @@
 #endif
 
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/jsapi-private.cpp b/gjs/jsapi-private.cpp
index f1ac44e..463619f 100644
--- a/gjs/jsapi-private.cpp
+++ b/gjs/jsapi-private.cpp
@@ -32,7 +32,11 @@
 #include "compat.h"
 
 #include <string.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
 #include <jscntxt.h>
+#pragma GCC diagnostic pop
 
 void
 gjs_error_reporter(JSContext     *context,
diff --git a/gjs/jsapi-private.h b/gjs/jsapi-private.h
index f48affe..c140f15 100644
--- a/gjs/jsapi-private.h
+++ b/gjs/jsapi-private.h
@@ -30,8 +30,8 @@
 #ifndef __GJS_JSAPI_PRIVATE_H__
 #define __GJS_JSAPI_PRIVATE_H__
 
-#include <jsapi.h>
 #include <glib-object.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index 191dfd8..1540706 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -28,7 +28,6 @@
 #error "Only <gjs/gjs-module.h> can be included directly."
 #endif
 
-#include <jsapi.h>
 #include <gjs/compat.h>
 #include <glib-object.h>
 
diff --git a/gjs/mem.h b/gjs/mem.h
index 3179c6e..a23a68d 100644
--- a/gjs/mem.h
+++ b/gjs/mem.h
@@ -29,7 +29,7 @@
 #endif
 
 #include <glib.h>
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/native.h b/gjs/native.h
index 80ee4c1..8b4e923 100644
--- a/gjs/native.h
+++ b/gjs/native.h
@@ -29,8 +29,7 @@
 #endif
 
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/profiler.c b/gjs/profiler.c
index 0e29542..915cb11 100644
--- a/gjs/profiler.c
+++ b/gjs/profiler.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include "profiler.h"
-#include <jsdbgapi.h>
 #include "compat.h"
 #include "jsapi-util.h"
 
diff --git a/gjs/profiler.h b/gjs/profiler.h
index b4a2c92..61e690d 100644
--- a/gjs/profiler.h
+++ b/gjs/profiler.h
@@ -24,8 +24,8 @@
 #ifndef __GJS_PROFILER_H__
 #define __GJS_PROFILER_H__
 
-#include <jsapi.h>
 #include <glib.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/stack.c b/gjs/stack.c
index 0117394..53f0359 100644
--- a/gjs/stack.c
+++ b/gjs/stack.c
@@ -43,7 +43,6 @@
 #include <config.h>
 #include <glib.h>
 #include <string.h>
-#include <jsdbgapi.h>
 #include "context.h"
 #include "compat.h"
 #include "jsapi-util.h"
diff --git a/modules/console.c b/modules/console.c
index 9e401b8..ca5c32d 100644
--- a/modules/console.c
+++ b/modules/console.c
@@ -49,7 +49,6 @@
 #include <readline/history.h>
 #endif
 
-#include <jsapi.h>
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <gjs/gjs-module.h>
diff --git a/modules/console.h b/modules/console.h
index da78760..3d7c6fc 100644
--- a/modules/console.h
+++ b/modules/console.h
@@ -26,8 +26,7 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/dbus-exports.c b/modules/dbus-exports.c
index d7ba22e..b61f250 100644
--- a/modules/dbus-exports.c
+++ b/modules/dbus-exports.c
@@ -31,8 +31,6 @@
 
 #include <util/log.h>
 
-#include <jsapi.h>
-
 #include <string.h>
 
 typedef struct {
diff --git a/modules/dbus-exports.h b/modules/dbus-exports.h
index 7c7029f..f70be44 100644
--- a/modules/dbus-exports.h
+++ b/modules/dbus-exports.h
@@ -23,8 +23,8 @@
 #define __GJS_JS_DBUS_EXPORTS_H__
 
 #include <glib.h>
-#include <jsapi.h>
 #include <dbus/dbus.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/dbus.h b/modules/dbus.h
index 0abea07..3df18c5 100644
--- a/modules/dbus.h
+++ b/modules/dbus.h
@@ -24,10 +24,8 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
-
 #include <gjs/gjs.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/debugger.c b/modules/debugger.c
index b1672c3..872579a 100644
--- a/modules/debugger.c
+++ b/modules/debugger.c
@@ -23,8 +23,6 @@
 
 #include <string.h>
 
-#include <jsapi.h>
-
 #include <glib.h>
 #include <gjs/gjs-module.h>
 
diff --git a/modules/debugger.h b/modules/debugger.h
index 2c61edc..af86a7c 100644
--- a/modules/debugger.h
+++ b/modules/debugger.h
@@ -26,8 +26,7 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/format.c b/modules/format.c
index 457e349..e73e73a 100644
--- a/modules/format.c
+++ b/modules/format.c
@@ -26,7 +26,6 @@
 #include <gjs/compat.h>
 
 #include <glib.h>
-#include <jsapi.h>
 
 static JSBool
 gjs_format_int_alternative_output(JSContext *context,
diff --git a/modules/format.h b/modules/format.h
index d51419f..61e25e3 100644
--- a/modules/format.h
+++ b/modules/format.h
@@ -26,8 +26,7 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/gettext-native.c b/modules/gettext-native.c
index a7bea27..f81ae4e 100644
--- a/modules/gettext-native.c
+++ b/modules/gettext-native.c
@@ -26,7 +26,6 @@
 #include <util/log.h>
 #include <gjs/gjs-module.h>
 #include <gjs/compat.h>
-#include <jsapi.h>
 #include <glib/gi18n.h>
 #include <gjs/compat.h>
 
diff --git a/modules/gettext-native.h b/modules/gettext-native.h
index bb58346..5ce5a7d 100644
--- a/modules/gettext-native.h
+++ b/modules/gettext-native.h
@@ -26,8 +26,7 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/lang.c b/modules/lang.c
index 6135745..736e460 100644
--- a/modules/lang.c
+++ b/modules/lang.c
@@ -26,7 +26,6 @@
 #include <gjs/compat.h>
 
 #include <glib.h>
-#include <jsapi.h>
 
 static JSBool
 gjs_lang_seal(JSContext *cx,
diff --git a/modules/lang.h b/modules/lang.h
index f1099ce..546b9d4 100644
--- a/modules/lang.h
+++ b/modules/lang.h
@@ -26,8 +26,7 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/mainloop.c b/modules/mainloop.c
index 67912b2..71dd693 100644
--- a/modules/mainloop.c
+++ b/modules/mainloop.c
@@ -31,8 +31,6 @@
 
 #include <glib.h>
 
-#include <jsapi.h>
-
 static GHashTable *pending_main_loops;
 
 static JSBool
diff --git a/modules/mainloop.h b/modules/mainloop.h
index fb4bda7..da7bb51 100644
--- a/modules/mainloop.h
+++ b/modules/mainloop.h
@@ -26,8 +26,7 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/system.c b/modules/system.c
index 7089d8b..d80c2b9 100644
--- a/modules/system.c
+++ b/modules/system.c
@@ -29,8 +29,6 @@
 
 #include <gjs/gjs-module.h>
 #include <gi/object.h>
-#include <jsapi.h>
-
 #include "system.h"
 
 static JSBool
diff --git a/modules/system.h b/modules/system.h
index 561cac0..ca093a6 100644
--- a/modules/system.h
+++ b/modules/system.h
@@ -27,8 +27,7 @@
 
 #include <config.h>
 #include <glib.h>
-
-#include <jsapi.h>
+#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]